[0-9]+(?:\.[0-9]+)*+) # release segment
(?P # pre-release
- [-_\.]?
+ [._-]?+
(?Palpha|a|beta|b|preview|pre|c|rc)
- [-_\.]?
+ [._-]?+
(?P[0-9]+)?
- )?
+ )?+
(?P # post release
(?:-(?P[0-9]+))
|
(?:
- [-_\.]?
+ [._-]?
(?Ppost|rev|r)
- [-_\.]?
+ [._-]?
(?P[0-9]+)?
)
- )?
+ )?+
(?P # dev release
- [-_\.]?
+ [._-]?+
(?Pdev)
- [-_\.]?
+ [._-]?+
(?P[0-9]+)?
- )?
+ )?+
)
- (?:\+(?P[a-z0-9]+(?:[-_\.][a-z0-9]+)*))? # local version
+ (?:\+
+ (?P # local version
+ [a-z0-9]+
+ (?:[._-][a-z0-9]+)*+
+ )
+ )?+
"""
-VERSION_PATTERN = _VERSION_PATTERN
+_VERSION_PATTERN_OLD = _VERSION_PATTERN.replace("*+", "*").replace("?+", "?")
+
+# Possessive qualifiers were added in Python 3.11.
+# CPython 3.11.0-3.11.4 had a bug: https://github.com/python/cpython/pull/107795
+# Older PyPy also had a bug.
+VERSION_PATTERN = (
+ _VERSION_PATTERN_OLD
+ if (sys.implementation.name == "cpython" and sys.version_info < (3, 11, 5))
+ or (sys.implementation.name == "pypy" and sys.version_info < (3, 11, 13))
+ or sys.version_info < (3, 11)
+ else _VERSION_PATTERN
+)
"""
A string containing the regular expression used to match a valid version.
@@ -158,6 +231,82 @@ def __ne__(self, other: object) -> bool:
"""
+# Validation pattern for local version in replace()
+_LOCAL_PATTERN = re.compile(r"[a-z0-9]+(?:[._-][a-z0-9]+)*", re.IGNORECASE)
+
+
+def _validate_epoch(value: object, /) -> int:
+ epoch = value or 0
+ if isinstance(epoch, int) and epoch >= 0:
+ return epoch
+ msg = f"epoch must be non-negative integer, got {epoch}"
+ raise InvalidVersion(msg)
+
+
+def _validate_release(value: object, /) -> tuple[int, ...]:
+ release = (0,) if value is None else value
+ if (
+ isinstance(release, tuple)
+ and len(release) > 0
+ and all(isinstance(i, int) and i >= 0 for i in release)
+ ):
+ return release
+ msg = f"release must be a non-empty tuple of non-negative integers, got {release}"
+ raise InvalidVersion(msg)
+
+
+def _validate_pre(value: object, /) -> tuple[Literal["a", "b", "rc"], int] | None:
+ if value is None:
+ return value
+ if (
+ isinstance(value, tuple)
+ and len(value) == 2
+ and value[0] in ("a", "b", "rc")
+ and isinstance(value[1], int)
+ and value[1] >= 0
+ ):
+ return value
+ msg = f"pre must be a tuple of ('a'|'b'|'rc', non-negative int), got {value}"
+ raise InvalidVersion(msg)
+
+
+def _validate_post(value: object, /) -> tuple[Literal["post"], int] | None:
+ if value is None:
+ return value
+ if isinstance(value, int) and value >= 0:
+ return ("post", value)
+ msg = f"post must be non-negative integer, got {value}"
+ raise InvalidVersion(msg)
+
+
+def _validate_dev(value: object, /) -> tuple[Literal["dev"], int] | None:
+ if value is None:
+ return value
+ if isinstance(value, int) and value >= 0:
+ return ("dev", value)
+ msg = f"dev must be non-negative integer, got {value}"
+ raise InvalidVersion(msg)
+
+
+def _validate_local(value: object, /) -> LocalType | None:
+ if value is None:
+ return value
+ if isinstance(value, str) and _LOCAL_PATTERN.fullmatch(value):
+ return _parse_local_version(value)
+ msg = f"local must be a valid version string, got {value!r}"
+ raise InvalidVersion(msg)
+
+
+# Backward compatibility for internals before 26.0. Do not use.
+class _Version(NamedTuple):
+ epoch: int
+ release: tuple[int, ...]
+ dev: tuple[str, int] | None
+ pre: tuple[str, int] | None
+ post: tuple[str, int] | None
+ local: LocalType | None
+
+
class Version(_BaseVersion):
"""This class abstracts handling of a project's versions.
@@ -182,8 +331,19 @@ class Version(_BaseVersion):
True
"""
- _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
- _key: CmpKey
+ __slots__ = ("_dev", "_epoch", "_key_cache", "_local", "_post", "_pre", "_release")
+ __match_args__ = ("_str",)
+
+ _regex = re.compile(r"\s*" + VERSION_PATTERN + r"\s*", re.VERBOSE | re.IGNORECASE)
+
+ _epoch: int
+ _release: tuple[int, ...]
+ _dev: tuple[str, int] | None
+ _pre: tuple[str, int] | None
+ _post: tuple[str, int] | None
+ _local: LocalType | None
+
+ _key_cache: CmpKey | None
def __init__(self, version: str) -> None:
"""Initialize a Version object.
@@ -195,34 +355,86 @@ def __init__(self, version: str) -> None:
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)
+ match = self._regex.fullmatch(version)
if not match:
raise InvalidVersion(f"Invalid version: {version!r}")
-
- # Store the parsed out pieces of the version
- self._version = _Version(
- epoch=int(match.group("epoch")) if match.group("epoch") else 0,
- release=tuple(int(i) for i in match.group("release").split(".")),
- pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
- post=_parse_letter_version(
- match.group("post_l"), match.group("post_n1") or match.group("post_n2")
- ),
- dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
- local=_parse_local_version(match.group("local")),
+ self._epoch = int(match.group("epoch")) if match.group("epoch") else 0
+ self._release = tuple(map(int, match.group("release").split(".")))
+ self._pre = _parse_letter_version(match.group("pre_l"), match.group("pre_n"))
+ self._post = _parse_letter_version(
+ match.group("post_l"), match.group("post_n1") or match.group("post_n2")
+ )
+ self._dev = _parse_letter_version(match.group("dev_l"), match.group("dev_n"))
+ self._local = _parse_local_version(match.group("local"))
+
+ # Key which will be used for sorting
+ self._key_cache = None
+
+ def __replace__(self, **kwargs: Unpack[_VersionReplace]) -> Self:
+ epoch = _validate_epoch(kwargs["epoch"]) if "epoch" in kwargs else self._epoch
+ release = (
+ _validate_release(kwargs["release"])
+ if "release" in kwargs
+ else self._release
)
+ pre = _validate_pre(kwargs["pre"]) if "pre" in kwargs else self._pre
+ post = _validate_post(kwargs["post"]) if "post" in kwargs else self._post
+ dev = _validate_dev(kwargs["dev"]) if "dev" in kwargs else self._dev
+ local = _validate_local(kwargs["local"]) if "local" in kwargs else self._local
+
+ if (
+ epoch == self._epoch
+ and release == self._release
+ and pre == self._pre
+ and post == self._post
+ and dev == self._dev
+ and local == self._local
+ ):
+ return self
+
+ new_version = self.__class__.__new__(self.__class__)
+ new_version._key_cache = None
+ new_version._epoch = epoch
+ new_version._release = release
+ new_version._pre = pre
+ new_version._post = post
+ new_version._dev = dev
+ new_version._local = local
+
+ return new_version
+
+ @property
+ def _key(self) -> CmpKey:
+ if self._key_cache is None:
+ self._key_cache = _cmpkey(
+ self._epoch,
+ self._release,
+ self._pre,
+ self._post,
+ self._dev,
+ self._local,
+ )
+ return self._key_cache
- # Generate a key which will be used for sorting
- self._key = _cmpkey(
- self._version.epoch,
- self._version.release,
- self._version.pre,
- self._version.post,
- self._version.dev,
- self._version.local,
+ @property
+ @_deprecated("Version._version is private and will be removed soon")
+ def _version(self) -> _Version:
+ return _Version(
+ self._epoch, self._release, self._dev, self._pre, self._post, self._local
)
+ @_version.setter
+ @_deprecated("Version._version is private and will be removed soon")
+ def _version(self, value: _Version) -> None:
+ self._epoch = value.epoch
+ self._release = value.release
+ self._dev = value.dev
+ self._pre = value.pre
+ self._post = value.post
+ self._local = value.local
+ self._key_cache = None
+
def __repr__(self) -> str:
"""A representation of the Version that shows all internal state.
@@ -237,32 +449,35 @@ def __str__(self) -> str:
>>> str(Version("1.0a5"))
'1.0a5'
"""
- parts = []
+ # This is a hot function, so not calling self.base_version
+ version = ".".join(map(str, self.release))
# Epoch
- if self.epoch != 0:
- parts.append(f"{self.epoch}!")
-
- # Release segment
- parts.append(".".join(str(x) for x in self.release))
+ if self.epoch:
+ version = f"{self.epoch}!{version}"
# Pre-release
if self.pre is not None:
- parts.append("".join(str(x) for x in self.pre))
+ version += "".join(map(str, self.pre))
# Post-release
if self.post is not None:
- parts.append(f".post{self.post}")
+ version += f".post{self.post}"
# Development release
if self.dev is not None:
- parts.append(f".dev{self.dev}")
+ version += f".dev{self.dev}"
# Local version segment
if self.local is not None:
- parts.append(f"+{self.local}")
+ version += f"+{self.local}"
+
+ return version
- return "".join(parts)
+ @property
+ def _str(self) -> str:
+ """Internal property for match_args"""
+ return str(self)
@property
def epoch(self) -> int:
@@ -273,7 +488,7 @@ def epoch(self) -> int:
>>> Version("1!2.0.0").epoch
1
"""
- return self._version.epoch
+ return self._epoch
@property
def release(self) -> tuple[int, ...]:
@@ -289,7 +504,7 @@ def release(self) -> tuple[int, ...]:
Includes trailing zeroes but not the epoch or any pre-release / development /
post-release suffixes.
"""
- return self._version.release
+ return self._release
@property
def pre(self) -> tuple[str, int] | None:
@@ -304,7 +519,7 @@ def pre(self) -> tuple[str, int] | None:
>>> Version("1.2.3rc1").pre
('rc', 1)
"""
- return self._version.pre
+ return self._pre
@property
def post(self) -> int | None:
@@ -315,7 +530,7 @@ def post(self) -> int | None:
>>> Version("1.2.3.post1").post
1
"""
- return self._version.post[1] if self._version.post else None
+ return self._post[1] if self._post else None
@property
def dev(self) -> int | None:
@@ -326,7 +541,7 @@ def dev(self) -> int | None:
>>> Version("1.2.3.dev1").dev
1
"""
- return self._version.dev[1] if self._version.dev else None
+ return self._dev[1] if self._dev else None
@property
def local(self) -> str | None:
@@ -337,8 +552,8 @@ def local(self) -> str | None:
>>> Version("1.2.3+abc").local
'abc'
"""
- if self._version.local:
- return ".".join(str(x) for x in self._version.local)
+ if self._local:
+ return ".".join(str(x) for x in self._local)
else:
return None
@@ -369,16 +584,8 @@ def base_version(self) -> str:
The "base version" is the public version of the project without any pre or post
release markers.
"""
- parts = []
-
- # Epoch
- if self.epoch != 0:
- parts.append(f"{self.epoch}!")
-
- # Release segment
- parts.append(".".join(str(x) for x in self.release))
-
- return "".join(parts)
+ release_segment = ".".join(map(str, self.release))
+ return f"{self.epoch}!{release_segment}" if self.epoch else release_segment
@property
def is_prerelease(self) -> bool:
@@ -452,6 +659,20 @@ def micro(self) -> int:
class _TrimmedRelease(Version):
+ __slots__ = ()
+
+ def __init__(self, version: str | Version) -> None:
+ if isinstance(version, Version):
+ self._epoch = version._epoch
+ self._release = version._release
+ self._dev = version._dev
+ self._pre = version._pre
+ self._post = version._post
+ self._local = version._local
+ self._key_cache = version._key_cache
+ return
+ super().__init__(version) # pragma: no cover
+
@property
def release(self) -> tuple[int, ...]:
"""
@@ -462,45 +683,35 @@ def release(self) -> tuple[int, ...]:
>>> _TrimmedRelease('0.0').release
(0,)
"""
+ # This leaves one 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]
+ len_release = len(rel)
+ i = len_release
+ while i > 1 and rel[i - 1] == 0:
+ i -= 1
+ return rel if i == len_release else rel[:i]
def _parse_letter_version(
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.
- if number is None:
- number = 0
-
# We normalize any letters to their lower case form
letter = letter.lower()
# We consider some words to be alternate spellings of other words and
# in those cases we want to normalize the spellings to our preferred
# spelling.
- if letter == "alpha":
- letter = "a"
- elif letter == "beta":
- letter = "b"
- elif letter in ["c", "pre", "preview"]:
- letter = "rc"
- elif letter in ["rev", "r"]:
- letter = "post"
-
- return letter, int(number)
-
- assert not letter
+ letter = _LETTER_NORMALIZATION.get(letter, letter)
+
+ # We consider there to be an implicit 0 in a pre-release if there is
+ # not a numeral associated with it.
+ return letter, int(number or 0)
+
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"
-
- return letter, int(number)
+ return "post", int(number)
return None
@@ -529,13 +740,12 @@ def _cmpkey(
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
- # re-reverse it back into the correct order and make it a tuple and use
- # that for our sorting key.
- _release = tuple(
- reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
- )
+ # trailing zeros removed. We will use this for our sorting key.
+ len_release = len(release)
+ i = len_release
+ while i and release[i - 1] == 0:
+ i -= 1
+ _release = release if i == len_release else release[:i]
# We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
# We'll do this by abusing the pre segment, but we _only_ want to do this
diff --git a/addons/source-python/packages/site-packages/path/__init__.py b/addons/source-python/packages/site-packages/path/__init__.py
index d99bfa5ec..33dd979ce 100644
--- a/addons/source-python/packages/site-packages/path/__init__.py
+++ b/addons/source-python/packages/site-packages/path/__init__.py
@@ -51,7 +51,7 @@
from types import ModuleType
with contextlib.suppress(ImportError):
- import win32security # type: ignore[import-not-found]
+ import win32security
with contextlib.suppress(ImportError):
import pwd
@@ -59,28 +59,28 @@
with contextlib.suppress(ImportError):
import grp
+from collections.abc import Generator, Iterable, Iterator
from typing import (
- TYPE_CHECKING,
IO,
+ TYPE_CHECKING,
Any,
BinaryIO,
Callable,
- Generator,
- Iterable,
- Iterator,
overload,
)
if TYPE_CHECKING:
- from typing_extensions import Literal, Never, Self, Union
+ from typing import Union
+
from _typeshed import (
+ ExcInfo,
OpenBinaryMode,
OpenBinaryModeReading,
OpenBinaryModeUpdating,
OpenBinaryModeWriting,
OpenTextMode,
- ExcInfo,
)
+ from typing_extensions import Literal, Never, Self
_Match = Union[str, Callable[[str], bool], None]
_CopyFn = Callable[[str, str], object]
@@ -92,7 +92,7 @@
from . import classes, masks, matchers
from .compat.py38 import removeprefix, removesuffix
-__all__ = ['Path', 'TempDir']
+__all__ = ['Path', 'TempDir', 'Traversal']
LINESEPS = ['\r\n', '\r', '\n']
U_LINESEPS = LINESEPS + ['\u0085', '\u2028', '\u2029']
@@ -1206,7 +1206,7 @@ def get_owner(self) -> str: # pragma: nocover
self, win32security.OWNER_SECURITY_INFORMATION
)
sid = desc.GetSecurityDescriptorOwner()
- account, domain, typecode = win32security.LookupAccountSid(None, sid)
+ account, domain, typecode = win32security.LookupAccountSid(None, sid) # type: ignore[arg-type]
return domain + '\\' + account
else:
@@ -1994,7 +1994,7 @@ def __new__(cls, *args, **kwargs) -> Self:
dirname = tempfile.mkdtemp(*args, **kwargs)
return super().__new__(cls, dirname)
- def __init__(self) -> None:
+ def __init__(self, *args, **kwargs) -> None:
pass
def __enter__(self) -> Self:
diff --git a/addons/source-python/packages/site-packages/path/masks.py b/addons/source-python/packages/site-packages/path/masks.py
index 2c727beee..6c551d71b 100644
--- a/addons/source-python/packages/site-packages/path/masks.py
+++ b/addons/source-python/packages/site-packages/path/masks.py
@@ -4,8 +4,8 @@
import itertools
import operator
import re
-
-from typing import Any, Callable, Iterable, Iterator
+from collections.abc import Iterable, Iterator
+from typing import Any, Callable
# from jaraco.functools
diff --git a/addons/source-python/packages/site-packages/pip/__init__.py b/addons/source-python/packages/site-packages/pip/__init__.py
index d628f93ee..978b41292 100644
--- a/addons/source-python/packages/site-packages/pip/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/__init__.py
@@ -1,9 +1,9 @@
-from typing import List, Optional
+from __future__ import annotations
-__version__ = "25.0.1"
+__version__ = "26.0.1"
-def main(args: Optional[List[str]] = None) -> int:
+def main(args: list[str] | None = None) -> int:
"""This is an internal API only meant for use by pip's own console scripts.
For additional details, see https://github.com/pypa/pip/issues/7498.
diff --git a/addons/source-python/packages/site-packages/pip/__pip-runner__.py b/addons/source-python/packages/site-packages/pip/__pip-runner__.py
index c633787fc..d6be15783 100644
--- a/addons/source-python/packages/site-packages/pip/__pip-runner__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_internal/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/__init__.py
index 1a5b7f87f..24d0baf0c 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/__init__.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from __future__ import annotations
from pip._internal.utils import _log
@@ -7,7 +7,7 @@
_log.init_logging()
-def main(args: Optional[List[str]] = None) -> int:
+def main(args: list[str] | None = None) -> int:
"""This is preserved for old console scripts that may still be referencing
it.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/build_env.py b/addons/source-python/packages/site-packages/pip/_internal/build_env.py
index e8d1aca0d..1a42a9d41 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/build_env.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/build_env.py
@@ -1,5 +1,6 @@
-"""Build Environment used for isolation during sdist building
-"""
+"""Build Environment used for isolation during sdist building"""
+
+from __future__ import annotations
import logging
import os
@@ -8,27 +9,46 @@
import sys
import textwrap
from collections import OrderedDict
+from collections.abc import Iterable, Sequence
+from contextlib import AbstractContextManager as ContextManager
+from contextlib import nullcontext
+from io import StringIO
from types import TracebackType
-from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type, Union
+from typing import TYPE_CHECKING, Protocol, TypedDict
from pip._vendor.packaging.version import Version
from pip import __file__ as pip_location
-from pip._internal.cli.spinners import open_spinner
+from pip._internal.cli.spinners import open_rich_spinner, open_spinner
+from pip._internal.exceptions import (
+ BuildDependencyInstallError,
+ DiagnosticPipError,
+ InstallWheelBuildError,
+ PipError,
+)
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.deprecation import deprecated
+from pip._internal.utils.logging import VERBOSE, capture_logging
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
if TYPE_CHECKING:
+ from pip._internal.cache import WheelCache
from pip._internal.index.package_finder import PackageFinder
+ from pip._internal.operations.build.build_tracker import BuildTracker
+ from pip._internal.req.req_install import InstallRequirement
+ from pip._internal.resolution.base import BaseResolver
+
+ class ExtraEnviron(TypedDict, total=False):
+ extra_environ: dict[str, str]
+
logger = logging.getLogger(__name__)
-def _dedup(a: str, b: str) -> Union[Tuple[str], Tuple[str, str]]:
+def _dedup(a: str, b: str) -> tuple[str] | tuple[str, str]:
return (a, b) if a != b else (a,)
@@ -57,7 +77,7 @@ def get_runnable_pip() -> str:
return os.fsdecode(source / "__pip-runner__.py")
-def _get_system_sitepackages() -> Set[str]:
+def _get_system_sitepackages() -> set[str]:
"""Get system site packages
Usually from site.getsitepackages,
@@ -77,10 +97,348 @@ def _get_system_sitepackages() -> Set[str]:
return {os.path.normcase(path) for path in system_sites}
+class BuildEnvironmentInstaller(Protocol):
+ """
+ Interface for installing build dependencies into an isolated build
+ environment.
+ """
+
+ def install(
+ self,
+ requirements: Iterable[str],
+ prefix: _Prefix,
+ *,
+ kind: str,
+ for_req: InstallRequirement | None,
+ ) -> None: ...
+
+
+class SubprocessBuildEnvironmentInstaller:
+ """
+ Install build dependencies by calling pip in a subprocess.
+ """
+
+ def __init__(
+ self,
+ finder: PackageFinder,
+ build_constraints: list[str] | None = None,
+ build_constraint_feature_enabled: bool = False,
+ ) -> None:
+ self.finder = finder
+ self._build_constraints = build_constraints or []
+ self._build_constraint_feature_enabled = build_constraint_feature_enabled
+
+ def _deprecation_constraint_check(self) -> None:
+ """
+ Check for deprecation warning: PIP_CONSTRAINT affecting build environments.
+
+ This warns when build-constraint feature is NOT enabled and PIP_CONSTRAINT
+ is not empty.
+ """
+ if self._build_constraint_feature_enabled or self._build_constraints:
+ return
+
+ pip_constraint = os.environ.get("PIP_CONSTRAINT")
+ if not pip_constraint or not pip_constraint.strip():
+ return
+
+ deprecated(
+ reason=(
+ "Setting PIP_CONSTRAINT will not affect "
+ "build constraints in the future,"
+ ),
+ replacement=(
+ "to specify build constraints using --build-constraint or "
+ "PIP_BUILD_CONSTRAINT. To disable this warning without "
+ "any build constraints set --use-feature=build-constraint or "
+ 'PIP_USE_FEATURE="build-constraint"'
+ ),
+ gone_in="26.2",
+ issue=None,
+ )
+
+ def install(
+ self,
+ requirements: Iterable[str],
+ prefix: _Prefix,
+ *,
+ kind: str,
+ for_req: InstallRequirement | None,
+ ) -> None:
+ self._deprecation_constraint_check()
+
+ finder = self.finder
+ args: list[str] = [
+ sys.executable,
+ get_runnable_pip(),
+ "install",
+ "--ignore-installed",
+ "--no-user",
+ "--prefix",
+ 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",
+ "",
+ ]
+ 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)
+ args.extend(
+ (
+ "--" + format_control.replace("_", "-"),
+ ",".join(sorted(formats or {":none:"})),
+ )
+ )
+
+ if finder.release_control is not None:
+ # Use ordered args to preserve the user's original command-line order
+ # This is important because later flags can override earlier ones
+ for attr_name, value in finder.release_control.get_ordered_args():
+ args.extend(("--" + attr_name.replace("_", "-"), value))
+
+ index_urls = finder.index_urls
+ if index_urls:
+ args.extend(["-i", index_urls[0]])
+ for extra_index in index_urls[1:]:
+ args.extend(["--extra-index-url", extra_index])
+ else:
+ args.append("--no-index")
+ 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.custom_cert:
+ args.extend(["--cert", finder.custom_cert])
+ if finder.client_cert:
+ args.extend(["--client-cert", finder.client_cert])
+ if finder.prefer_binary:
+ args.append("--prefer-binary")
+
+ # Handle build constraints
+ if self._build_constraint_feature_enabled:
+ args.extend(["--use-feature", "build-constraint"])
+
+ if self._build_constraints:
+ # Build constraints must be passed as both constraints
+ # and build constraints, so that nested builds receive
+ # build constraints
+ for constraint_file in self._build_constraints:
+ args.extend(["--constraint", constraint_file])
+ args.extend(["--build-constraint", constraint_file])
+
+ extra_environ: ExtraEnviron = {}
+ if self._build_constraint_feature_enabled and not self._build_constraints:
+ # If there are no build constraints but the build constraints
+ # feature is enabled then we must ignore regular constraints
+ # in the isolated build environment
+ extra_environ = {"extra_environ": {"_PIP_IN_BUILD_IGNORE_CONSTRAINTS": "1"}}
+
+ if finder.uploaded_prior_to:
+ args.extend(["--uploaded-prior-to", finder.uploaded_prior_to.isoformat()])
+ args.append("--")
+ args.extend(requirements)
+
+ identify_requirement = (
+ f" for {for_req.name}" if for_req and for_req.name else ""
+ )
+ with open_spinner(f"Installing {kind}") as spinner:
+ call_subprocess(
+ args,
+ command_desc=f"installing {kind}{identify_requirement}",
+ spinner=spinner,
+ **extra_environ,
+ )
+
+
+class InprocessBuildEnvironmentInstaller:
+ """
+ Build dependency installer that runs in the same pip process.
+
+ This contains a stripped down version of the install command with
+ only the logic necessary for installing build dependencies. The
+ finder, session, build tracker, and wheel cache are reused, but new
+ instances of everything else are created as needed.
+
+ Options are inherited from the parent install command unless
+ they don't make sense for build dependencies (in which case, they
+ are hard-coded, see comments below).
+ """
+
+ def __init__(
+ self,
+ *,
+ finder: PackageFinder,
+ build_tracker: BuildTracker,
+ wheel_cache: WheelCache,
+ build_constraints: Sequence[InstallRequirement] = (),
+ verbosity: int = 0,
+ ) -> None:
+ from pip._internal.operations.prepare import RequirementPreparer
+
+ self._finder = finder
+ self._build_constraints = build_constraints
+ self._wheel_cache = wheel_cache
+ self._level = 0
+
+ build_dir = TempDirectory(kind="build-env-install", globally_managed=True)
+ self._preparer = RequirementPreparer(
+ build_isolation_installer=self,
+ # Inherited options or state.
+ finder=finder,
+ session=finder._link_collector.session,
+ build_dir=build_dir.path,
+ build_tracker=build_tracker,
+ verbosity=verbosity,
+ # This is irrelevant as it only applies to editable requirements.
+ src_dir="",
+ # Hard-coded options (that should NOT be inherited).
+ download_dir=None,
+ build_isolation=True,
+ check_build_deps=False,
+ progress_bar="off",
+ # TODO: hash-checking should be extended to build deps, but that is
+ # deferred for later as it'd be a breaking change.
+ require_hashes=False,
+ use_user_site=False,
+ lazy_wheel=False,
+ legacy_resolver=False,
+ )
+
+ def install(
+ self,
+ requirements: Iterable[str],
+ prefix: _Prefix,
+ *,
+ kind: str,
+ for_req: InstallRequirement | None,
+ ) -> None:
+ """Install entrypoint. Manages output capturing and error handling."""
+ capture_logs = not logger.isEnabledFor(VERBOSE) and self._level == 0
+ if capture_logs:
+ # Hide the logs from the installation of build dependencies.
+ # They will be shown only if an error occurs.
+ capture_ctx: ContextManager[StringIO] = capture_logging()
+ spinner: ContextManager[None] = open_rich_spinner(f"Installing {kind}")
+ else:
+ # Otherwise, pass-through all logs (with a header).
+ capture_ctx, spinner = nullcontext(StringIO()), nullcontext()
+ logger.info("Installing %s ...", kind)
+
+ try:
+ self._level += 1
+ with spinner, capture_ctx as stream:
+ self._install_impl(requirements, prefix)
+
+ except DiagnosticPipError as exc:
+ # Format similar to a nested subprocess error, where the
+ # causing error is shown first, followed by the build error.
+ logger.info(textwrap.dedent(stream.getvalue()))
+ logger.error("%s", exc, extra={"rich": True})
+ logger.info("")
+ raise BuildDependencyInstallError(
+ for_req, requirements, cause=exc, log_lines=None
+ )
+
+ except Exception as exc:
+ logs: list[str] | None = textwrap.dedent(stream.getvalue()).splitlines()
+ if not capture_logs:
+ # If logs aren't being captured, then display the error inline
+ # with the rest of the logs.
+ logs = None
+ if isinstance(exc, PipError):
+ logger.error("%s", exc)
+ else:
+ logger.exception("pip crashed unexpectedly")
+ raise BuildDependencyInstallError(
+ for_req, requirements, cause=exc, log_lines=logs
+ )
+
+ finally:
+ self._level -= 1
+
+ def _install_impl(self, requirements: Iterable[str], prefix: _Prefix) -> None:
+ """Core build dependency install logic."""
+ from pip._internal.commands.install import installed_packages_summary
+ from pip._internal.req import install_given_reqs
+ from pip._internal.req.constructors import install_req_from_line
+ from pip._internal.wheel_builder import build
+
+ ireqs = [install_req_from_line(req, user_supplied=True) for req in requirements]
+ ireqs.extend(self._build_constraints)
+
+ resolver = self._make_resolver()
+ resolved_set = resolver.resolve(ireqs, check_supported_wheels=True)
+ self._preparer.prepare_linked_requirements_more(
+ resolved_set.requirements.values()
+ )
+
+ reqs_to_build = [
+ r for r in resolved_set.requirements_to_install if not r.is_wheel
+ ]
+ _, build_failures = build(reqs_to_build, self._wheel_cache, verify=True)
+ if build_failures:
+ raise InstallWheelBuildError(build_failures)
+
+ installed = install_given_reqs(
+ resolver.get_installation_order(resolved_set),
+ prefix=prefix.path,
+ # Hard-coded options (that should NOT be inherited).
+ root=None,
+ home=None,
+ warn_script_location=False,
+ use_user_site=False,
+ # As the build environment is ephemeral, it's wasteful to
+ # pre-compile everything since not all modules will be used.
+ pycompile=False,
+ progress_bar="off",
+ )
+
+ env = get_environment(list(prefix.lib_dirs))
+ if summary := installed_packages_summary(installed, env):
+ logger.info(summary)
+
+ def _make_resolver(self) -> BaseResolver:
+ """Create a new resolver for one time use."""
+ # Legacy installer never used the legacy resolver so create a
+ # resolvelib resolver directly. Yuck.
+ from pip._internal.req.constructors import install_req_from_req_string
+ from pip._internal.resolution.resolvelib.resolver import Resolver
+
+ return Resolver(
+ make_install_req=install_req_from_req_string,
+ # Inherited state.
+ preparer=self._preparer,
+ finder=self._finder,
+ wheel_cache=self._wheel_cache,
+ # Hard-coded options (that should NOT be inherited).
+ ignore_requires_python=False,
+ use_user_site=False,
+ ignore_dependencies=False,
+ ignore_installed=True,
+ force_reinstall=False,
+ upgrade_strategy="to-satisfy-only",
+ py_version_info=None,
+ )
+
+
class BuildEnvironment:
"""Creates and manages an isolated environment to install build deps"""
- def __init__(self) -> None:
+ def __init__(self, installer: BuildEnvironmentInstaller) -> None:
+ self.installer = installer
temp_dir = TempDirectory(kind=tempdir_kinds.BUILD_ENV, globally_managed=True)
self._prefixes = OrderedDict(
@@ -88,8 +446,8 @@ def __init__(self) -> None:
for name in ("normal", "overlay")
)
- self._bin_dirs: List[str] = []
- self._lib_dirs: List[str] = []
+ self._bin_dirs: list[str] = []
+ self._lib_dirs: list[str] = []
for prefix in reversed(list(self._prefixes.values())):
self._bin_dirs.append(prefix.bin_dir)
self._lib_dirs.extend(prefix.lib_dirs)
@@ -157,9 +515,9 @@ def __enter__(self) -> None:
def __exit__(
self,
- exc_type: Optional[Type[BaseException]],
- exc_val: Optional[BaseException],
- exc_tb: Optional[TracebackType],
+ exc_type: type[BaseException] | None,
+ exc_val: BaseException | None,
+ exc_tb: TracebackType | None,
) -> None:
for varname, old_value in self._save_env.items():
if old_value is None:
@@ -169,7 +527,7 @@ def __exit__(
def check_requirements(
self, reqs: Iterable[str]
- ) -> Tuple[Set[Tuple[str, str]], Set[str]]:
+ ) -> tuple[set[tuple[str, str]], set[str]]:
"""Return 2 sets:
- conflicting requirements: set of (installed, wanted) reqs tuples
- missing requirements: set of reqs
@@ -203,92 +561,18 @@ def check_requirements(
def install_requirements(
self,
- finder: "PackageFinder",
requirements: Iterable[str],
prefix_as_string: str,
*,
kind: str,
+ for_req: InstallRequirement | None = None,
) -> None:
prefix = self._prefixes[prefix_as_string]
assert not prefix.setup
prefix.setup = True
if not requirements:
return
- self._install_requirements(
- get_runnable_pip(),
- finder,
- requirements,
- prefix,
- kind=kind,
- )
-
- @staticmethod
- def _install_requirements(
- pip_runnable: str,
- finder: "PackageFinder",
- requirements: Iterable[str],
- prefix: _Prefix,
- *,
- kind: str,
- ) -> None:
- args: List[str] = [
- sys.executable,
- pip_runnable,
- "install",
- "--ignore-installed",
- "--no-user",
- "--prefix",
- 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")
- elif logger.getEffectiveLevel() <= VERBOSE:
- args.append("-v")
- for format_control in ("no_binary", "only_binary"):
- formats = getattr(finder.format_control, format_control)
- args.extend(
- (
- "--" + format_control.replace("_", "-"),
- ",".join(sorted(formats or {":none:"})),
- )
- )
-
- index_urls = finder.index_urls
- if index_urls:
- args.extend(["-i", index_urls[0]])
- for extra_index in index_urls[1:]:
- args.extend(["--extra-index-url", extra_index])
- else:
- args.append("--no-index")
- 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.custom_cert:
- args.extend(["--cert", finder.custom_cert])
- 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)
- with open_spinner(f"Installing {kind}") as spinner:
- call_subprocess(
- args,
- command_desc=f"pip subprocess to install {kind}",
- spinner=spinner,
- )
+ self.installer.install(requirements, prefix, kind=kind, for_req=for_req)
class NoOpBuildEnvironment(BuildEnvironment):
@@ -302,9 +586,9 @@ def __enter__(self) -> None:
def __exit__(
self,
- exc_type: Optional[Type[BaseException]],
- exc_val: Optional[BaseException],
- exc_tb: Optional[TracebackType],
+ exc_type: type[BaseException] | None,
+ exc_val: BaseException | None,
+ exc_tb: TracebackType | None,
) -> None:
pass
@@ -313,10 +597,10 @@ def cleanup(self) -> None:
def install_requirements(
self,
- finder: "PackageFinder",
requirements: Iterable[str],
prefix_as_string: str,
*,
kind: str,
+ for_req: InstallRequirement | None = None,
) -> None:
raise NotImplementedError()
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cache.py b/addons/source-python/packages/site-packages/pip/_internal/cache.py
index 6b4512672..0bcb69754 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cache.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cache.py
@@ -1,12 +1,13 @@
-"""Cache Management
-"""
+"""Cache Management"""
+
+from __future__ import annotations
import hashlib
import json
import logging
import os
from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any
from pip._vendor.packaging.tags import Tag, interpreter_name, interpreter_version
from pip._vendor.packaging.utils import canonicalize_name
@@ -23,7 +24,7 @@
ORIGIN_JSON_NAME = "origin.json"
-def _hash_dict(d: Dict[str, str]) -> str:
+def _hash_dict(d: dict[str, str]) -> str:
"""Return a stable sha224 of a dictionary."""
s = json.dumps(d, sort_keys=True, separators=(",", ":"), ensure_ascii=True)
return hashlib.sha224(s.encode("ascii")).hexdigest()
@@ -40,7 +41,7 @@ def __init__(self, cache_dir: str) -> None:
assert not cache_dir or os.path.isabs(cache_dir)
self.cache_dir = cache_dir or None
- def _get_cache_path_parts(self, link: Link) -> List[str]:
+ 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
@@ -73,7 +74,7 @@ def _get_cache_path_parts(self, link: Link) -> List[str]:
return parts
- def _get_candidates(self, link: Link, canonical_package_name: str) -> List[Any]:
+ def _get_candidates(self, link: Link, canonical_package_name: str) -> list[Any]:
can_not_cache = not self.cache_dir or not canonical_package_name or not link
if can_not_cache:
return []
@@ -90,8 +91,8 @@ def get_path_for_link(self, link: Link) -> str:
def get(
self,
link: Link,
- package_name: Optional[str],
- supported_tags: List[Tag],
+ package_name: str | None,
+ supported_tags: list[Tag],
) -> Link:
"""Returns a link to a cached item if it exists, otherwise returns the
passed link.
@@ -128,8 +129,8 @@ def get_path_for_link(self, link: Link) -> str:
def get(
self,
link: Link,
- package_name: Optional[str],
- supported_tags: List[Tag],
+ package_name: str | None,
+ supported_tags: list[Tag],
) -> Link:
candidates = []
@@ -142,7 +143,7 @@ def get(
wheel = Wheel(wheel_name)
except InvalidWheelFilename:
continue
- if canonicalize_name(wheel.name) != canonical_package_name:
+ if wheel.name != canonical_package_name:
logger.debug(
"Ignoring cached wheel %s for %s as it "
"does not match the expected distribution name %s.",
@@ -189,7 +190,7 @@ def __init__(
):
self.link = link
self.persistent = persistent
- self.origin: Optional[DirectUrl] = None
+ self.origin: DirectUrl | None = None
origin_direct_url_path = Path(self.link.file_path).parent / ORIGIN_JSON_NAME
if origin_direct_url_path.exists():
try:
@@ -226,8 +227,8 @@ def get_ephem_path_for_link(self, link: Link) -> str:
def get(
self,
link: Link,
- package_name: Optional[str],
- supported_tags: List[Tag],
+ package_name: str | None,
+ supported_tags: list[Tag],
) -> Link:
cache_entry = self.get_cache_entry(link, package_name, supported_tags)
if cache_entry is None:
@@ -237,9 +238,9 @@ def get(
def get_cache_entry(
self,
link: Link,
- package_name: Optional[str],
- supported_tags: List[Tag],
- ) -> Optional[CacheEntry]:
+ package_name: str | None,
+ supported_tags: list[Tag],
+ ) -> CacheEntry | None:
"""Returns a CacheEntry with a link to a cached item if it exists or
None. The cache entry indicates if the item was found in the persistent
or ephemeral cache.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/cli/__init__.py
index e589bb917..5fcddf5d8 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_internal/cli/autocompletion.py b/addons/source-python/packages/site-packages/pip/_internal/cli/autocompletion.py
index f3f70ac85..f22cd1159 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/autocompletion.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/autocompletion.py
@@ -1,11 +1,13 @@
-"""Logic that powers autocompletion installed by ``pip completion``.
-"""
+"""Logic that powers autocompletion installed by ``pip completion``."""
+
+from __future__ import annotations
import optparse
import os
import sys
+from collections.abc import Iterable
from itertools import chain
-from typing import Any, Iterable, List, Optional
+from typing import Any
from pip._internal.cli.main_parser import create_main_parser
from pip._internal.commands import commands_dict, create_command
@@ -33,7 +35,7 @@ def autocomplete() -> None:
options = []
# subcommand
- subcommand_name: Optional[str] = None
+ subcommand_name: str | None = None
for word in cwords:
if word in subcommands:
subcommand_name = word
@@ -101,6 +103,12 @@ def autocomplete() -> None:
if option[1] and option[0][:2] == "--":
opt_label += "="
print(opt_label)
+
+ # Complete sub-commands (unless one is already given).
+ if not any(name in cwords for name in subcommand.handler_map()):
+ for handler_name in subcommand.handler_map():
+ if handler_name.startswith(current):
+ print(handler_name)
else:
# show main parser options only when necessary
@@ -122,8 +130,8 @@ def autocomplete() -> None:
def get_path_completion_type(
- cwords: List[str], cword: int, opts: Iterable[Any]
-) -> Optional[str]:
+ cwords: list[str], cword: int, opts: Iterable[Any]
+) -> str | None:
"""Get the type of path completion (``file``, ``dir``, ``path`` or None)
:param cwords: same as the environmental variable ``COMP_WORDS``
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/base_command.py b/addons/source-python/packages/site-packages/pip/_internal/cli/base_command.py
index 362f84b6b..499a46f96 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/base_command.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/base_command.py
@@ -1,5 +1,7 @@
"""Base Command class, and related routines"""
+from __future__ import annotations
+
import logging
import logging.config
import optparse
@@ -7,7 +9,7 @@
import sys
import traceback
from optparse import Values
-from typing import List, Optional, Tuple
+from typing import Callable
from pip._vendor.rich import reconfigure
from pip._vendor.rich import traceback as rich_traceback
@@ -29,7 +31,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
@@ -61,7 +62,7 @@ def __init__(self, name: str, summary: str, isolated: bool = False) -> None:
isolated=isolated,
)
- self.tempdir_registry: Optional[TempDirRegistry] = None
+ self.tempdir_registry: TempDirRegistry | None = None
# Commands should add options to this option group
optgroup_name = f"{self.name.capitalize()} Options"
@@ -88,10 +89,10 @@ def handle_pip_version_check(self, options: Values) -> None:
# are present.
assert not hasattr(options, "no_index")
- def run(self, options: Values, args: List[str]) -> int:
+ 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 _run_wrapper(self, level_number: int, options: Values, args: list[str]) -> int:
def _inner_run() -> int:
try:
return self.run(options, args)
@@ -148,18 +149,18 @@ def _inner_run() -> int:
return UNKNOWN_ERROR
- def parse_args(self, args: List[str]) -> Tuple[Values, List[str]]:
+ def parse_args(self, args: list[str]) -> tuple[Values, list[str]]:
# factored out for testability
return self.parser.parse_args(args)
- def main(self, args: List[str]) -> int:
+ def main(self, args: list[str]) -> int:
try:
with self.main_context():
return self._main(args)
finally:
logging.shutdown()
- def _main(self, args: List[str]) -> int:
+ def _main(self, args: list[str]) -> int:
# We must initialize this before the tempdir manager, otherwise the
# configuration would not be accessible by the time we clean up the
# tempdir manager.
@@ -172,6 +173,11 @@ 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
+
+ if hasattr(options, "progress_bar") and options.progress_bar == "auto":
+ options.progress_bar = "on" if self.verbosity >= 0 else "off"
reconfigure(no_color=options.no_color)
level_number = setup_logging(
@@ -229,12 +235,21 @@ 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,
+ if (
+ "inprocess-build-deps" in options.features_enabled
+ and os.environ.get("PIP_CONSTRAINT", "")
+ and "build-constraint" not in options.features_enabled
+ ):
+ logger.warning(
+ "In-process build dependencies are enabled, "
+ "PIP_CONSTRAINT will have no effect for build dependencies"
)
+ options.features_enabled.append("build-constraint")
return self._run_wrapper(level_number, options, args)
+
+ def handler_map(self) -> dict[str, Callable[[Values, list[str]], None]]:
+ """
+ map of names to handler actions for commands with sub-actions
+ """
+ return {}
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/cmdoptions.py b/addons/source-python/packages/site-packages/pip/_internal/cli/cmdoptions.py
index eeb7e651b..a269f8614 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/cmdoptions.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/cmdoptions.py
@@ -9,15 +9,16 @@
# The following comment should be removed at some point in the future.
# mypy: strict-optional=False
+from __future__ import annotations
-import importlib.util
import logging
import os
+import pathlib
import textwrap
from functools import partial
from optparse import SUPPRESS_HELP, Option, OptionGroup, OptionParser, Values
from textwrap import dedent
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import Any, Callable
from pip._vendor.packaging.utils import canonicalize_name
@@ -26,7 +27,9 @@
from pip._internal.locations import USER_CACHE_DIR, get_src_prefix
from pip._internal.models.format_control import FormatControl
from pip._internal.models.index import PyPI
+from pip._internal.models.release_control import ReleaseControl
from pip._internal.models.target_python import TargetPython
+from pip._internal.utils.datetime import parse_iso_datetime
from pip._internal.utils.hashes import STRONG_HASHES
from pip._internal.utils.misc import strtobool
@@ -47,7 +50,7 @@ def raise_option_error(parser: OptionParser, option: Option, msg: str) -> None:
parser.error(msg)
-def make_option_group(group: Dict[str, Any], parser: ConfigOptionParser) -> OptionGroup:
+def make_option_group(group: dict[str, Any], parser: ConfigOptionParser) -> OptionGroup:
"""
Return an OptionGroup object
group -- assumed to be dict with 'name' and 'options' keys
@@ -99,6 +102,29 @@ def check_dist_restriction(options: Values, check_target: bool = False) -> None:
)
+def check_build_constraints(options: Values) -> None:
+ """Function for validating build constraints options.
+
+ :param options: The OptionParser options.
+ """
+ if hasattr(options, "build_constraints") and options.build_constraints:
+ if not options.build_isolation:
+ raise CommandError(
+ "--build-constraint cannot be used with --no-build-isolation."
+ )
+
+ # Import here to avoid circular imports
+ from pip._internal.network.session import PipSession
+ from pip._internal.req.req_file import get_file_content
+
+ # Eagerly check build constraints file contents
+ # is valid so that we don't fail in when trying
+ # to check constraints in isolated build process
+ with PipSession() as session:
+ for constraint_file in options.build_constraints:
+ get_file_content(constraint_file, session)
+
+
def _path_option_check(option: Option, opt: str, value: str) -> str:
return os.path.expanduser(value)
@@ -159,8 +185,7 @@ class PipOption(Option):
action="store_true",
default=False,
help=(
- "Allow pip to only run in a virtual environment; "
- "exit with an error otherwise."
+ "Allow pip to only run in a virtual environment; exit with an error otherwise."
),
)
@@ -226,9 +251,13 @@ class PipOption(Option):
"--progress-bar",
dest="progress_bar",
type="choice",
- choices=["on", "off", "raw"],
- default="on",
- help="Specify whether the progress bar should be used [on, off, raw] (default: on)",
+ choices=["auto", "on", "off", "raw"],
+ default="auto",
+ help=(
+ "Specify whether the progress bar should be used. In 'auto'"
+ " mode, --quiet will suppress all progress bars."
+ " [auto, on, off, raw] (default: auto)"
+ ),
)
log: Callable[..., Option] = partial(
@@ -280,8 +309,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=5,
+ help="Maximum attempts to resume or restart an incomplete download. "
+ "(default: %default)",
)
timeout: Callable[..., Option] = partial(
@@ -390,6 +428,54 @@ def find_links() -> Option:
)
+def _handle_uploaded_prior_to(
+ option: Option, opt: str, value: str, parser: OptionParser
+) -> None:
+ """
+ This is an optparse.Option callback for the --uploaded-prior-to option.
+
+ Parses an ISO 8601 datetime string. If no timezone is specified in the string,
+ local timezone is used.
+
+ Note: This option only works with indexes that provide upload-time metadata
+ as specified in the simple repository API:
+ https://packaging.python.org/en/latest/specifications/simple-repository-api/
+ """
+ if value is None:
+ return None
+
+ try:
+ uploaded_prior_to = parse_iso_datetime(value)
+ # Use local timezone if no offset is given in the ISO string.
+ if uploaded_prior_to.tzinfo is None:
+ uploaded_prior_to = uploaded_prior_to.astimezone()
+ parser.values.uploaded_prior_to = uploaded_prior_to
+ except ValueError as exc:
+ msg = (
+ f"invalid value: {value!r}: {exc}. "
+ f"Expected an ISO 8601 datetime string, "
+ f"e.g '2023-01-01' or '2023-01-01T00:00:00Z'"
+ )
+ raise_option_error(parser, option=option, msg=msg)
+
+
+def uploaded_prior_to() -> Option:
+ return Option(
+ "--uploaded-prior-to",
+ dest="uploaded_prior_to",
+ metavar="datetime",
+ action="callback",
+ callback=_handle_uploaded_prior_to,
+ type="str",
+ help=(
+ "Only consider packages uploaded prior to the given date time. "
+ "Accepts ISO 8601 strings (e.g., '2023-01-01T00:00:00Z'). "
+ "Uses local timezone if none specified. Only effective when "
+ "installing from indexes that provide upload-time metadata."
+ ),
+ )
+
+
def trusted_host() -> Option:
return Option(
"--trusted-host",
@@ -415,6 +501,21 @@ def constraints() -> Option:
)
+def build_constraints() -> Option:
+ return Option(
+ "--build-constraint",
+ dest="build_constraints",
+ action="append",
+ type="str",
+ default=[],
+ metavar="file",
+ help=(
+ "Constrain build dependencies using the given constraints file. "
+ "This option can be used multiple times."
+ ),
+ )
+
+
def requirements() -> Option:
return Option(
"-r",
@@ -428,6 +529,18 @@ def requirements() -> Option:
)
+def requirements_from_scripts() -> Option:
+ return Option(
+ "--requirements-from-script",
+ action="append",
+ default=[],
+ dest="requirements_from_scripts",
+ metavar="file",
+ help="Install dependencies of the given script file"
+ "as defined by PEP 723 inline metadata. ",
+ )
+
+
def editable() -> Option:
return Option(
"-e",
@@ -529,6 +642,86 @@ def only_binary() -> Option:
)
+def _get_release_control(values: Values, option: Option) -> Any:
+ """Get a release_control object."""
+ return getattr(values, option.dest)
+
+
+def _handle_all_releases(
+ option: Option, opt_str: str, value: str, parser: OptionParser
+) -> None:
+ existing = _get_release_control(parser.values, option)
+ existing.handle_mutual_excludes(
+ value,
+ existing.all_releases,
+ existing.only_final,
+ "all_releases",
+ )
+
+
+def _handle_only_final(
+ option: Option, opt_str: str, value: str, parser: OptionParser
+) -> None:
+ existing = _get_release_control(parser.values, option)
+ existing.handle_mutual_excludes(
+ value,
+ existing.only_final,
+ existing.all_releases,
+ "only_final",
+ )
+
+
+def all_releases() -> Option:
+ release_control = ReleaseControl(set(), set())
+ return Option(
+ "--all-releases",
+ dest="release_control",
+ action="callback",
+ callback=_handle_all_releases,
+ type="str",
+ default=release_control,
+ help="Allow all release types (including pre-releases) for a package. "
+ "Can be supplied multiple times, and each time adds to the existing "
+ 'value. Accepts either ":all:" to allow pre-releases for all '
+ 'packages, ":none:" to empty the set (notice the colons), or one or '
+ "more package names with commas between them (no colons). Cannot be "
+ "used with --pre.",
+ )
+
+
+def only_final() -> Option:
+ release_control = ReleaseControl(set(), set())
+ return Option(
+ "--only-final",
+ dest="release_control",
+ action="callback",
+ callback=_handle_only_final,
+ type="str",
+ default=release_control,
+ help="Only allow final releases (no pre-releases) for a package. Can be "
+ "supplied multiple times, and each time adds to the existing value. "
+ 'Accepts either ":all:" to disable pre-releases for all packages, '
+ '":none:" to empty the set, or one or more package names with commas '
+ "between them. Cannot be used with --pre.",
+ )
+
+
+def check_release_control_exclusive(options: Values) -> None:
+ """
+ Raise an error if --pre is used with --all-releases or --only-final,
+ and transform --pre into --all-releases :all: if used alone.
+ """
+ if not hasattr(options, "pre") or not options.pre:
+ return
+
+ release_control = options.release_control
+ if release_control.all_releases or release_control.only_final:
+ raise CommandError("--pre cannot be used with --all-releases or --only-final.")
+
+ # Transform --pre into --all-releases :all:
+ release_control.all_releases.add(":all:")
+
+
platforms: Callable[..., Option] = partial(
Option,
"--platform",
@@ -545,7 +738,7 @@ def only_binary() -> Option:
# This was made a separate function for unit-testing purposes.
-def _convert_python_version(value: str) -> Tuple[Tuple[int, ...], Optional[str]]:
+def _convert_python_version(value: str) -> tuple[tuple[int, ...], str | None]:
"""
Convert a version string like "3", "37", or "3.7.3" into a tuple of ints.
@@ -733,6 +926,46 @@ 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=[],
+ 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, the name of the file must be "pyproject.toml". '
+ 'Defaults to using "pyproject.toml" in the current directory.',
+)
+
ignore_requires_python: Callable[..., Option] = partial(
Option,
"--ignore-requires-python",
@@ -741,6 +974,7 @@ def _handle_no_cache_dir(
help="Ignore the Requires-Python information.",
)
+
no_build_isolation: Callable[..., Option] = partial(
Option,
"--no-build-isolation",
@@ -758,62 +992,16 @@ def _handle_no_cache_dir(
dest="check_build_deps",
action="store_true",
default=False,
- help="Check the build dependencies when PEP517 is used.",
+ help="Check the build dependencies.",
)
-def _handle_no_use_pep517(
- option: Option, opt: str, value: str, parser: OptionParser
-) -> None:
- """
- Process a value provided for the --no-use-pep517 option.
-
- This is an optparse.Option callback for the no_use_pep517 option.
- """
- # Since --no-use-pep517 doesn't accept arguments, the value argument
- # will be None if --no-use-pep517 is passed via the command-line.
- # However, the value can be non-None if the option is triggered e.g.
- # by an environment variable, for example "PIP_NO_USE_PEP517=true".
- if value is not None:
- msg = """A value was passed for --no-use-pep517,
- probably using either the PIP_NO_USE_PEP517 environment variable
- or the "no-use-pep517" config file option. Use an appropriate value
- of the PIP_USE_PEP517 environment variable or the "use-pep517"
- config file option instead.
- """
- raise_option_error(parser, option=option, msg=msg)
-
- # If user doesn't wish to use pep517, we check if setuptools and wheel are installed
- # and raise error if it is not.
- packages = ("setuptools", "wheel")
- if not all(importlib.util.find_spec(package) for package in packages):
- msg = (
- f"It is not possible to use --no-use-pep517 "
- f"without {' and '.join(packages)} installed."
- )
- raise_option_error(parser, option=option, msg=msg)
-
- # Otherwise, --no-use-pep517 was passed via the command-line.
- parser.values.use_pep517 = False
-
-
use_pep517: Any = partial(
Option,
"--use-pep517",
dest="use_pep517",
action="store_true",
- default=None,
- help="Use PEP 517 for building source distributions "
- "(use --no-use-pep517 to force legacy behaviour).",
-)
-
-no_use_pep517: Any = partial(
- Option,
- "--no-use-pep517",
- dest="use_pep517",
- action="callback",
- callback=_handle_no_use_pep517,
- default=None,
+ default=True,
help=SUPPRESS_HELP,
)
@@ -846,30 +1034,11 @@ def _handle_config_settings(
action="callback",
callback=_handle_config_settings,
metavar="settings",
- help="Configuration settings to be passed to the PEP 517 build backend. "
+ help="Configuration settings to be passed to the build backend. "
"Settings take the form KEY=VALUE. Use multiple --config-settings options "
"to pass multiple keys to the backend.",
)
-build_options: Callable[..., Option] = partial(
- Option,
- "--build-option",
- dest="build_options",
- metavar="options",
- action="append",
- help="Extra arguments to be supplied to 'setup.py bdist_wheel'.",
-)
-
-global_options: Callable[..., Option] = partial(
- Option,
- "--global-option",
- dest="global_options",
- action="append",
- metavar="options",
- help="Extra global options to be supplied to the setup.py "
- "call before the install or bdist_wheel command.",
-)
-
no_clean: Callable[..., Option] = partial(
Option,
"--no-clean",
@@ -887,6 +1056,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",
@@ -990,7 +1167,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.
)
@@ -1009,6 +1186,8 @@ def check_list_path_option(options: Values) -> None:
default=[],
choices=[
"fast-deps",
+ "build-constraint",
+ "inprocess-build-deps",
]
+ ALWAYS_ENABLED_FEATURES,
help="Enable new functionality, that may be backward incompatible.",
@@ -1028,12 +1207,11 @@ def check_list_path_option(options: Values) -> None:
help=("Enable deprecated functionality, that will be removed in the future."),
)
-
##########
# groups #
##########
-general_group: Dict[str, Any] = {
+general_group: dict[str, Any] = {
"name": "General Options",
"options": [
help_,
@@ -1061,15 +1239,29 @@ def check_list_path_option(options: Values) -> None:
no_python_version_warning,
use_new_feature,
use_deprecated_feature,
+ resume_retries,
],
}
-index_group: Dict[str, Any] = {
+index_group: dict[str, Any] = {
"name": "Package Index Options",
"options": [
index_url,
extra_index_url,
no_index,
find_links,
+ uploaded_prior_to,
+ ],
+}
+
+package_selection_group: dict[str, Any] = {
+ "name": "Package Selection Options",
+ "options": [
+ pre,
+ all_releases,
+ only_final,
+ no_binary,
+ only_binary,
+ prefer_binary,
],
}
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/command_context.py b/addons/source-python/packages/site-packages/pip/_internal/cli/command_context.py
index 139995ac3..9c167bdc3 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/command_context.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/command_context.py
@@ -1,5 +1,6 @@
-from contextlib import ExitStack, contextmanager
-from typing import ContextManager, Generator, TypeVar
+from collections.abc import Generator
+from contextlib import AbstractContextManager, ExitStack, contextmanager
+from typing import TypeVar
_T = TypeVar("_T", covariant=True)
@@ -21,7 +22,7 @@ def main_context(self) -> Generator[None, None, None]:
finally:
self._in_main_context = False
- def enter_context(self, context_provider: ContextManager[_T]) -> _T:
+ def enter_context(self, context_provider: AbstractContextManager[_T]) -> _T:
assert self._in_main_context
return self._main_context.enter_context(context_provider)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/index_command.py b/addons/source-python/packages/site-packages/pip/_internal/cli/index_command.py
index 295108ed6..0f1ee1a4f 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/index_command.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/index_command.py
@@ -6,11 +6,14 @@
--uptodate) don't need waste time importing PipSession and friends.
"""
+from __future__ import annotations
+
import logging
import os
import sys
+from functools import lru_cache
from optparse import Values
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING
from pip._vendor import certifi
@@ -20,12 +23,15 @@
if TYPE_CHECKING:
from ssl import SSLContext
+ from pip._vendor.packaging.utils import NormalizedName
+
from pip._internal.network.session import PipSession
logger = logging.getLogger(__name__)
-def _create_truststore_ssl_context() -> Optional["SSLContext"]:
+@lru_cache
+def _create_truststore_ssl_context() -> SSLContext | None:
if sys.version_info < (3, 10):
logger.debug("Disabling truststore because Python version isn't 3.10+")
return None
@@ -54,10 +60,10 @@ class SessionCommandMixin(CommandContextMixIn):
def __init__(self) -> None:
super().__init__()
- self._session: Optional[PipSession] = None
+ self._session: PipSession | None = None
@classmethod
- def _get_index_urls(cls, options: Values) -> Optional[List[str]]:
+ def _get_index_urls(cls, options: Values) -> list[str] | None:
"""Return a list of index urls from user-provided options."""
index_urls = []
if not getattr(options, "no_index", False):
@@ -70,7 +76,7 @@ def _get_index_urls(cls, options: Values) -> Optional[List[str]]:
# Return None rather than an empty list
return index_urls or None
- def get_default_session(self, options: Values) -> "PipSession":
+ 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))
@@ -83,9 +89,9 @@ def get_default_session(self, options: Values) -> "PipSession":
def _build_session(
self,
options: Values,
- retries: Optional[int] = None,
- timeout: Optional[int] = None,
- ) -> "PipSession":
+ retries: int | None = None,
+ timeout: int | None = None,
+ ) -> PipSession:
from pip._internal.network.session import PipSession
cache_dir = options.cache_dir
@@ -99,6 +105,7 @@ def _build_session(
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,
+ resume_retries=options.resume_retries,
trusted_hosts=options.trusted_hosts,
index_urls=self._get_index_urls(options),
ssl_context=ssl_context,
@@ -132,7 +139,7 @@ def _build_session(
return session
-def _pip_self_version_check(session: "PipSession", options: Values) -> None:
+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)
@@ -145,6 +152,23 @@ class IndexGroupCommand(Command, SessionCommandMixin):
This also corresponds to the commands that permit the pip version check.
"""
+ def should_exclude_prerelease(
+ self, options: Values, package_name: NormalizedName
+ ) -> bool:
+ """
+ Determine if pre-releases should be excluded for a package.
+ """
+ # Check per-package release control settings
+ if options.release_control:
+ allow_prereleases = options.release_control.allows_prereleases(package_name)
+ if allow_prereleases is True:
+ return False # Include pre-releases
+ elif allow_prereleases is False:
+ return True # Exclude pre-releases
+
+ # No specific setting: exclude prereleases by default
+ return True
+
def handle_pip_version_check(self, options: Values) -> None:
"""
Do the pip version check if not disabled.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/main.py b/addons/source-python/packages/site-packages/pip/_internal/cli/main.py
index 563ac79c9..78c30c3a9 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/main.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/main.py
@@ -1,18 +1,12 @@
-"""Primary application entrypoint.
-"""
+"""Primary application entrypoint."""
+
+from __future__ import annotations
import locale
import logging
import os
import sys
import warnings
-from typing import List, Optional
-
-from pip._internal.cli.autocompletion import autocomplete
-from pip._internal.cli.main_parser import parse_command
-from pip._internal.commands import create_command
-from pip._internal.exceptions import PipError
-from pip._internal.utils import deprecation
logger = logging.getLogger(__name__)
@@ -44,7 +38,18 @@
# main, this should not be an issue in practice.
-def main(args: Optional[List[str]] = None) -> int:
+def main(args: list[str] | None = None) -> int:
+ # NOTE: Lazy imports to speed up import of this module,
+ # which is imported from the pip console script. This doesn't
+ # speed up normal pip execution, but might be important in the future
+ # if we use ``multiprocessing`` module,
+ # which imports __main__ for each spawned subprocess.
+ from pip._internal.cli.autocompletion import autocomplete
+ from pip._internal.cli.main_parser import parse_command
+ from pip._internal.commands import create_command
+ from pip._internal.exceptions import PipError
+ from pip._internal.utils import deprecation
+
if args is None:
args = sys.argv[1:]
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/main_parser.py b/addons/source-python/packages/site-packages/pip/_internal/cli/main_parser.py
index 5ade356b9..136852466 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/main_parser.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/main_parser.py
@@ -1,10 +1,12 @@
-"""A single place for constructing and exposing the main parser
-"""
+"""A single place for constructing and exposing the main parser"""
+
+from __future__ import annotations
import os
import subprocess
import sys
-from typing import List, Optional, Tuple
+
+from pip._vendor.rich.markup import escape
from pip._internal.build_env import get_runnable_pip
from pip._internal.cli import cmdoptions
@@ -39,7 +41,7 @@ def create_main_parser() -> ConfigOptionParser:
# create command listing for description
description = [""] + [
- f"{name:27} {command_info.summary}"
+ f"[optparse.longargs]{name:27}[/] {escape(command_info.summary)}"
for name, command_info in commands_dict.items()
]
parser.description = "\n".join(description)
@@ -47,7 +49,7 @@ def create_main_parser() -> ConfigOptionParser:
return parser
-def identify_python_interpreter(python: str) -> Optional[str]:
+def identify_python_interpreter(python: str) -> str | None:
# If the named file exists, use it.
# If it's a directory, assume it's a virtual environment and
# look for the environment's Python executable.
@@ -66,7 +68,7 @@ def identify_python_interpreter(python: str) -> Optional[str]:
return None
-def parse_command(args: List[str]) -> Tuple[str, List[str]]:
+def parse_command(args: list[str]) -> tuple[str, list[str]]:
parser = create_main_parser()
# Note: parser calls disable_interspersed_args(), so the result of this
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/parser.py b/addons/source-python/packages/site-packages/pip/_internal/cli/parser.py
index bc4aca032..a49898020 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/parser.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/parser.py
@@ -1,15 +1,24 @@
"""Base option parser setup"""
+from __future__ import annotations
+
import logging
import optparse
+import os
+import re
import shutil
import sys
import textwrap
+from collections.abc import Generator
from contextlib import suppress
-from typing import Any, Dict, Generator, List, NoReturn, Optional, Tuple
+from typing import Any, NoReturn
+
+from pip._vendor.rich.markup import escape
+from pip._vendor.rich.theme import Theme
from pip._internal.cli.status_codes import UNKNOWN_ERROR
from pip._internal.configuration import Configuration, ConfigurationError
+from pip._internal.utils.logging import PipConsole
from pip._internal.utils.misc import redact_auth_from_url, strtobool
logger = logging.getLogger(__name__)
@@ -18,6 +27,17 @@
class PrettyHelpFormatter(optparse.IndentedHelpFormatter):
"""A prettier/less verbose help formatter for optparse."""
+ styles = {
+ "optparse.shortargs": "green",
+ "optparse.longargs": "cyan",
+ "optparse.groups": "bold blue",
+ "optparse.metavar": "yellow",
+ }
+ highlights = {
+ r"\s(-{1}[\w]+[\w-]*)": "shortargs", # highlight -letter as short args
+ r"\s(-{2}[\w]+[\w-]*)": "longargs", # highlight --words as long args
+ }
+
def __init__(self, *args: Any, **kwargs: Any) -> None:
# help position must be aligned with __init__.parseopts.description
kwargs["max_help_position"] = 30
@@ -26,72 +46,100 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
super().__init__(*args, **kwargs)
def format_option_strings(self, option: optparse.Option) -> str:
- return self._format_option_strings(option)
-
- def _format_option_strings(
- self, option: optparse.Option, mvarfmt: str = " <{}>", optsep: str = ", "
- ) -> str:
- """
- Return a comma-separated list of option strings and metavars.
-
- :param option: tuple of (short opt, long opt), e.g: ('-f', '--format')
- :param mvarfmt: metavar format string
- :param optsep: separator
- """
+ """Return a comma-separated list of option strings and metavars."""
opts = []
if option._short_opts:
- opts.append(option._short_opts[0])
+ opts.append(f"[optparse.shortargs]{option._short_opts[0]}[/]")
if option._long_opts:
- opts.append(option._long_opts[0])
+ opts.append(f"[optparse.longargs]{option._long_opts[0]}[/]")
if len(opts) > 1:
- opts.insert(1, optsep)
+ opts.insert(1, ", ")
if option.takes_value():
assert option.dest is not None
metavar = option.metavar or option.dest.lower()
- opts.append(mvarfmt.format(metavar.lower()))
+ opts.append(f" [optparse.metavar]<{escape(metavar.lower())}>[/]")
return "".join(opts)
+ def format_option(self, option: optparse.Option) -> str:
+ """Overridden method with Rich support."""
+ # fmt: off
+ result = []
+ opts = self.option_strings[option]
+ opt_width = self.help_position - self.current_indent - 2
+ # Remove the rich style tags before calculating width during
+ # text wrap calculations. Also store the length removed to adjust
+ # the padding in the else branch.
+ stripped = re.sub(r"(\[[a-z.]+\])|(\[\/\])", "", opts)
+ style_tag_length = len(opts) - len(stripped)
+ if len(stripped) > opt_width:
+ opts = "%*s%s\n" % (self.current_indent, "", opts) # noqa: UP031
+ indent_first = self.help_position
+ else: # start help on same line as opts
+ opts = "%*s%-*s " % (self.current_indent, "", # noqa: UP031
+ opt_width + style_tag_length, opts)
+ indent_first = 0
+ result.append(opts)
+ if option.help:
+ help_text = self.expand_default(option)
+ help_lines = textwrap.wrap(help_text, self.help_width)
+ result.append("%*s%s\n" % (indent_first, "", help_lines[0])) # noqa: UP031
+ result.extend(["%*s%s\n" % (self.help_position, "", line) # noqa: UP031
+ for line in help_lines[1:]])
+ elif opts[-1] != "\n":
+ result.append("\n")
+ return "".join(result)
+ # fmt: on
+
def format_heading(self, heading: str) -> str:
if heading == "Options":
return ""
- return heading + ":\n"
+ return "[optparse.groups]" + escape(heading) + ":[/]\n"
def format_usage(self, usage: str) -> str:
"""
Ensure there is only one newline between usage and the first heading
if there is no description.
"""
- msg = "\nUsage: {}\n".format(self.indent_lines(textwrap.dedent(usage), " "))
+ contents = self.indent_lines(textwrap.dedent(usage), " ")
+ msg = f"\n[optparse.groups]Usage:[/] {escape(contents)}\n"
return msg
- def format_description(self, description: Optional[str]) -> str:
+ def format_description(self, description: str | None) -> str:
# leave full control over description to us
if description:
if hasattr(self.parser, "main"):
- label = "Commands"
+ label = "[optparse.groups]Commands:[/]"
else:
- label = "Description"
+ label = "[optparse.groups]Description:[/]"
+
# some doc strings have initial newlines, some don't
description = description.lstrip("\n")
# some doc strings have final newlines and spaces, some don't
description = description.rstrip()
# dedent, then reindent
description = self.indent_lines(textwrap.dedent(description), " ")
- description = f"{label}:\n{description}\n"
+ description = f"{label}\n{description}\n"
return description
else:
return ""
- def format_epilog(self, epilog: Optional[str]) -> str:
+ def format_epilog(self, epilog: str | None) -> str:
# leave full control over epilog to us
if epilog:
- return epilog
+ return escape(epilog)
else:
return ""
+ def expand_default(self, option: optparse.Option) -> str:
+ """Overridden HelpFormatter.expand_default() which colorizes flags."""
+ help = escape(super().expand_default(option))
+ for regex, style in self.highlights.items():
+ help = re.sub(regex, rf"[optparse.{style}] \1[/]", help)
+ return help
+
def indent_lines(self, text: str, indent: str) -> str:
new_lines = [indent + line for line in text.split("\n")]
return "\n".join(new_lines)
@@ -142,7 +190,7 @@ def insert_option_group(
return group
@property
- def option_list_all(self) -> List[optparse.Option]:
+ def option_list_all(self) -> list[optparse.Option]:
"""Get a list of all options, including those in option groups."""
res = self.option_list[:]
for i in self.option_groups:
@@ -177,33 +225,36 @@ def check_default(self, option: optparse.Option, key: str, val: Any) -> Any:
def _get_ordered_configuration_items(
self,
- ) -> Generator[Tuple[str, Any], None, None]:
+ ) -> Generator[tuple[str, Any], None, None]:
# Configuration gives keys in an unordered manner. Order them.
override_order = ["global", self.name, ":env:"]
# Pool the options into different groups
- section_items: Dict[str, List[Tuple[str, Any]]] = {
- name: [] for name in override_order
+ # Use a dict because we need to implement the fallthrough logic after PR 12201
+ # was merged which removed the fallthrough logic for options
+ section_items_dict: dict[str, dict[str, Any]] = {
+ name: {} for name in override_order
}
- for section_key, val in self.config.items():
- # ignore empty values
- if not val:
- logger.debug(
- "Ignoring configuration key '%s' as it's value is empty.",
- section_key,
- )
- continue
- section, key = section_key.split(".", 1)
- if section in override_order:
- section_items[section].append((key, val))
+ for _, value in self.config.items():
+ for section_key, val in value.items():
+
+ section, key = section_key.split(".", 1)
+ if section in override_order:
+ section_items_dict[section][key] = val
+
+ # Now that we a dict of items per section, convert to list of tuples
+ # Make sure we completely remove empty values again
+ section_items = {
+ name: [(k, v) for k, v in section_items_dict[name].items() if v]
+ for name in override_order
+ }
# Yield each group in their override order
for section in override_order:
- for key, val in section_items[section]:
- yield key, val
+ yield from section_items[section]
- def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]:
+ def _update_defaults(self, defaults: dict[str, Any]) -> dict[str, Any]:
"""Updates the given defaults with values from the config files and
the environ. Does a little special handling for certain types of
options (lists)."""
@@ -292,3 +343,16 @@ def get_default_values(self) -> optparse.Values:
def error(self, msg: str) -> NoReturn:
self.print_usage(sys.stderr)
self.exit(UNKNOWN_ERROR, f"{msg}\n")
+
+ def print_help(self, file: Any = None) -> None:
+ # This is unfortunate but necessary since arguments may have not been
+ # parsed yet at this point, so detect --no-color manually.
+ no_color = (
+ "--no-color" in sys.argv
+ or bool(strtobool(os.environ.get("PIP_NO_COLOR", "no") or "no"))
+ or "NO_COLOR" in os.environ
+ )
+ console = PipConsole(
+ theme=Theme(PrettyHelpFormatter.styles), no_color=no_color, file=file
+ )
+ console.print(self.format_help().rstrip(), highlight=False)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/progress_bars.py b/addons/source-python/packages/site-packages/pip/_internal/cli/progress_bars.py
index 3d9dde8ed..4931c85bc 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/progress_bars.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/progress_bars.py
@@ -1,11 +1,15 @@
+from __future__ import annotations
+
import functools
import sys
-from typing import Callable, Generator, Iterable, Iterator, Optional, Tuple
+from collections.abc import Generator, Iterable, Iterator
+from typing import TYPE_CHECKING, Callable, Literal, TypeVar
from pip._vendor.rich.progress import (
BarColumn,
DownloadColumn,
FileSizeColumn,
+ MofNCompleteColumn,
Progress,
ProgressColumn,
SpinnerColumn,
@@ -16,22 +20,28 @@
)
from pip._internal.cli.spinners import RateLimiter
-from pip._internal.utils.logging import get_indentation
+from pip._internal.utils.logging import get_console, get_indentation
+
+if TYPE_CHECKING:
+ from pip._internal.req.req_install import InstallRequirement
-DownloadProgressRenderer = Callable[[Iterable[bytes]], Iterator[bytes]]
+T = TypeVar("T")
+ProgressRenderer = Callable[[Iterable[T]], Iterator[T]]
+BarType = Literal["on", "off", "raw"]
-def _rich_progress_bar(
+def _rich_download_progress_bar(
iterable: Iterable[bytes],
*,
- bar_type: str,
- size: Optional[int],
+ bar_type: BarType,
+ size: int | None,
+ initial_progress: int | None = None,
) -> Generator[bytes, None, None]:
assert bar_type == "on", "This should only be used in the default mode."
if not size:
total = float("inf")
- columns: Tuple[ProgressColumn, ...] = (
+ columns: tuple[ProgressColumn, ...] = (
TextColumn("[progress.description]{task.description}"),
SpinnerColumn("line", speed=1.5),
FileSizeColumn(),
@@ -45,28 +55,56 @@ def _rich_progress_bar(
BarColumn(),
DownloadColumn(),
TransferSpeedColumn(),
- TextColumn("eta"),
- TimeRemainingColumn(),
+ TextColumn("{task.fields[time_description]}"),
+ TimeRemainingColumn(elapsed_when_finished=True),
)
progress = Progress(*columns, refresh_per_second=5)
- task_id = progress.add_task(" " * (get_indentation() + 2), total=total)
+ task_id = progress.add_task(
+ " " * (get_indentation() + 2), total=total, time_description="eta"
+ )
+ if initial_progress is not None:
+ progress.update(task_id, advance=initial_progress)
with progress:
for chunk in iterable:
yield chunk
progress.update(task_id, advance=len(chunk))
+ progress.update(task_id, time_description="")
+
+
+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],
*,
- size: Optional[int],
+ size: int | None,
+ initial_progress: int | None = 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)
@@ -80,15 +118,36 @@ def write_progress(current: int, total: int) -> None:
def get_download_progress_renderer(
- *, bar_type: str, size: Optional[int] = None
-) -> DownloadProgressRenderer:
+ *, bar_type: BarType, size: int | None = None, initial_progress: int | None = None
+) -> 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,
+ 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
+
+
+def get_install_progress_renderer(
+ *, bar_type: BarType, 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/addons/source-python/packages/site-packages/pip/_internal/cli/req_command.py b/addons/source-python/packages/site-packages/pip/_internal/cli/req_command.py
index 92900f94f..60b82fb99 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/req_command.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/req_command.py
@@ -5,16 +5,29 @@
PackageFinder machinery and all its vendored dependencies, etc.
"""
+from __future__ import annotations
+
import logging
+import os
from functools import partial
from optparse import Values
-from typing import Any, List, Optional, Tuple
+from typing import Any, Callable, TypeVar
+from pip._internal.build_env import (
+ BuildEnvironmentInstaller,
+ InprocessBuildEnvironmentInstaller,
+ SubprocessBuildEnvironmentInstaller,
+)
from pip._internal.cache import WheelCache
from pip._internal.cli import cmdoptions
+from pip._internal.cli.cmdoptions import make_target_python
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.exceptions import (
+ CommandError,
+ PreviousBuildDirError,
+ UnsupportedPythonVersion,
+)
from pip._internal.index.collector import LinkCollector
from pip._internal.index.package_finder import PackageFinder
from pip._internal.models.selection_prefs import SelectionPreferences
@@ -28,9 +41,12 @@
install_req_from_parsed_requirement,
install_req_from_req_string,
)
+from pip._internal.req.pep723 import PEP723Exception, pep723_metadata
+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
+from pip._internal.utils.packaging import check_requires_python
from pip._internal.utils.temp_dir import (
TempDirectory,
TempDirectoryTypeRegistry,
@@ -40,6 +56,16 @@
logger = logging.getLogger(__name__)
+def should_ignore_regular_constraints(options: Values) -> bool:
+ """
+ Check if regular constraints should be ignored because
+ we are in a isolated build process and build constraints
+ feature is enabled but no build constraints were passed.
+ """
+
+ return os.environ.get("_PIP_IN_BUILD_IGNORE_CONSTRAINTS") == "1"
+
+
KEEPABLE_TEMPDIR_TYPES = [
tempdir_kinds.BUILD_ENV,
tempdir_kinds.EPHEM_WHEEL_CACHE,
@@ -47,7 +73,12 @@
]
-def with_cleanup(func: Any) -> Any:
+_CommandT = TypeVar("_CommandT", bound="RequirementCommand")
+
+
+def with_cleanup(
+ func: Callable[[_CommandT, Values, list[str]], int],
+) -> Callable[[_CommandT, Values, list[str]], int]:
"""Decorator for common logic related to managing temporary
directories.
"""
@@ -56,9 +87,7 @@ def configure_tempdir_registry(registry: TempDirectoryTypeRegistry) -> None:
for t in KEEPABLE_TEMPDIR_TYPES:
registry.set_delete(t, False)
- def wrapper(
- self: RequirementCommand, options: Values, args: List[Any]
- ) -> Optional[int]:
+ def wrapper(self: _CommandT, options: Values, args: list[str]) -> int:
assert self.tempdir_registry is not None
if options.no_clean:
configure_tempdir_registry(self.tempdir_registry)
@@ -75,10 +104,36 @@ def wrapper(
return wrapper
+def parse_constraint_files(
+ constraint_files: list[str],
+ finder: PackageFinder,
+ options: Values,
+ session: PipSession,
+) -> list[InstallRequirement]:
+ requirements = []
+ for filename in constraint_files:
+ for parsed_req in parse_requirements(
+ filename,
+ constraint=True,
+ finder=finder,
+ options=options,
+ session=session,
+ ):
+ req_to_add = install_req_from_parsed_requirement(
+ parsed_req,
+ isolated=options.isolated_mode,
+ user_supplied=False,
+ )
+ requirements.append(req_to_add)
+
+ return requirements
+
+
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
@@ -98,7 +153,7 @@ def make_requirement_preparer(
session: PipSession,
finder: PackageFinder,
use_user_site: bool,
- download_dir: Optional[str] = None,
+ download_dir: str | None = None,
verbosity: int = 0,
) -> RequirementPreparer:
"""
@@ -127,11 +182,37 @@ def make_requirement_preparer(
"fast-deps has no effect when used with the legacy resolver."
)
+ # Handle build constraints
+ build_constraints = getattr(options, "build_constraints", [])
+ build_constraint_feature_enabled = (
+ "build-constraint" in options.features_enabled
+ )
+
+ env_installer: BuildEnvironmentInstaller
+ if "inprocess-build-deps" in options.features_enabled:
+ build_constraint_reqs = parse_constraint_files(
+ build_constraints, finder, options, session
+ )
+ env_installer = InprocessBuildEnvironmentInstaller(
+ finder=finder,
+ build_tracker=build_tracker,
+ build_constraints=build_constraint_reqs,
+ verbosity=verbosity,
+ wheel_cache=WheelCache(options.cache_dir),
+ )
+ else:
+ env_installer = SubprocessBuildEnvironmentInstaller(
+ finder,
+ build_constraints=build_constraints,
+ build_constraint_feature_enabled=build_constraint_feature_enabled,
+ )
+
return RequirementPreparer(
build_dir=temp_build_dir_path,
src_dir=options.src_dir,
download_dir=download_dir,
build_isolation=options.build_isolation,
+ build_isolation_installer=env_installer,
check_build_deps=options.check_build_deps,
build_tracker=build_tracker,
session=session,
@@ -150,14 +231,13 @@ def make_resolver(
preparer: RequirementPreparer,
finder: PackageFinder,
options: Values,
- wheel_cache: Optional[WheelCache] = None,
+ wheel_cache: WheelCache | None = None,
use_user_site: bool = False,
ignore_installed: bool = True,
ignore_requires_python: bool = False,
force_reinstall: bool = False,
upgrade_strategy: str = "to-satisfy-only",
- use_pep517: Optional[bool] = None,
- py_version_info: Optional[Tuple[int, ...]] = None,
+ py_version_info: tuple[int, ...] | None = None,
) -> BaseResolver:
"""
Create a Resolver instance for the given parameters.
@@ -165,7 +245,6 @@ def make_resolver(
make_install_req = partial(
install_req_from_req_string,
isolated=options.isolated_mode,
- use_pep517=use_pep517,
)
resolver_variant = cls.determine_resolver_variant(options)
# The long import name and duplicated invocation is needed to convince
@@ -205,47 +284,48 @@ def make_resolver(
def get_requirements(
self,
- args: List[str],
+ args: list[str],
options: Values,
finder: PackageFinder,
session: PipSession,
- ) -> List[InstallRequirement]:
+ ) -> list[InstallRequirement]:
"""
Parse command-line arguments into the corresponding requirements.
"""
- requirements: List[InstallRequirement] = []
- for filename in options.constraints:
- for parsed_req in parse_requirements(
- filename,
- constraint=True,
- finder=finder,
- options=options,
- session=session,
- ):
- req_to_add = install_req_from_parsed_requirement(
- parsed_req,
- isolated=options.isolated_mode,
- user_supplied=False,
- )
- requirements.append(req_to_add)
+ requirements: list[InstallRequirement] = []
+
+ if not should_ignore_regular_constraints(options):
+ constraints = parse_constraint_files(
+ options.constraints, finder, options, session
+ )
+ requirements.extend(constraints)
for req in args:
+ if not req.strip():
+ continue
req_to_add = install_req_from_line(
req,
comes_from=None,
isolated=options.isolated_mode,
- use_pep517=options.use_pep517,
user_supplied=True,
config_settings=getattr(options, "config_settings", None),
)
requirements.append(req_to_add)
+ if options.dependency_groups:
+ for req in parse_dependency_groups(options.dependency_groups):
+ req_to_add = install_req_from_req_string(
+ req,
+ isolated=options.isolated_mode,
+ user_supplied=True,
+ )
+ requirements.append(req_to_add)
+
for req in options.editables:
req_to_add = install_req_from_editable(
req,
user_supplied=True,
isolated=options.isolated_mode,
- use_pep517=options.use_pep517,
config_settings=getattr(options, "config_settings", None),
)
requirements.append(req_to_add)
@@ -258,7 +338,6 @@ def get_requirements(
req_to_add = install_req_from_parsed_requirement(
parsed_req,
isolated=options.isolated_mode,
- use_pep517=options.use_pep517,
user_supplied=True,
config_settings=(
parsed_req.options.get("config_settings")
@@ -268,11 +347,49 @@ def get_requirements(
)
requirements.append(req_to_add)
+ if options.requirements_from_scripts:
+ if len(options.requirements_from_scripts) > 1:
+ raise CommandError("--requirements-from-script can only be given once")
+
+ script = options.requirements_from_scripts[0]
+ try:
+ script_metadata = pep723_metadata(script)
+ except PEP723Exception as exc:
+ raise CommandError(exc.msg)
+
+ script_requires_python = script_metadata.get("requires-python", "")
+
+ if script_requires_python and not options.ignore_requires_python:
+ target_python = make_target_python(options)
+
+ if not check_requires_python(
+ requires_python=script_requires_python,
+ version_info=target_python.py_version_info,
+ ):
+ raise UnsupportedPythonVersion(
+ f"Script {script!r} requires a different Python: "
+ f"{target_python.py_version} not in {script_requires_python!r}"
+ )
+
+ for req in script_metadata.get("dependencies", []):
+ req_to_add = install_req_from_req_string(
+ req,
+ isolated=options.isolated_mode,
+ user_supplied=True,
+ )
+ requirements.append(req_to_add)
+
# If any requirement has hash options, enable hash checking.
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
+ or options.requirements_from_scripts
+ ):
opts = {"name": self.name}
if options.find_links:
raise CommandError(
@@ -304,8 +421,8 @@ def _build_package_finder(
self,
options: Values,
session: PipSession,
- target_python: Optional[TargetPython] = None,
- ignore_requires_python: Optional[bool] = None,
+ target_python: TargetPython | None = None,
+ ignore_requires_python: bool | None = None,
) -> PackageFinder:
"""
Create a package finder appropriate to this requirement command.
@@ -317,7 +434,7 @@ def _build_package_finder(
selection_prefs = SelectionPreferences(
allow_yanked=True,
format_control=options.format_control,
- allow_all_prereleases=options.pre,
+ release_control=options.release_control,
prefer_binary=options.prefer_binary,
ignore_requires_python=ignore_requires_python,
)
@@ -326,4 +443,5 @@ def _build_package_finder(
link_collector=link_collector,
selection_prefs=selection_prefs,
target_python=target_python,
+ uploaded_prior_to=options.uploaded_prior_to,
)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/cli/spinners.py b/addons/source-python/packages/site-packages/pip/_internal/cli/spinners.py
index cf2b976f3..58aad2853 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/cli/spinners.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/cli/spinners.py
@@ -1,15 +1,31 @@
+from __future__ import annotations
+
import contextlib
import itertools
import logging
import sys
import time
-from typing import IO, Generator, Optional
+from collections.abc import Generator
+from typing import IO, Final
+
+from pip._vendor.rich.console import (
+ Console,
+ ConsoleOptions,
+ RenderableType,
+ RenderResult,
+)
+from pip._vendor.rich.live import Live
+from pip._vendor.rich.measure import Measurement
+from pip._vendor.rich.text import Text
from pip._internal.utils.compat import WINDOWS
-from pip._internal.utils.logging import get_indentation
+from pip._internal.utils.logging import get_console, get_indentation
logger = logging.getLogger(__name__)
+SPINNER_CHARS: Final = r"-\|/"
+SPINS_PER_SECOND: Final = 8
+
class SpinnerInterface:
def spin(self) -> None:
@@ -23,10 +39,10 @@ class InteractiveSpinner(SpinnerInterface):
def __init__(
self,
message: str,
- file: Optional[IO[str]] = None,
- spin_chars: str = "-\\|/",
+ file: IO[str] | None = None,
+ spin_chars: str = SPINNER_CHARS,
# Empirically, 8 updates/second looks nice
- min_update_interval_seconds: float = 0.125,
+ min_update_interval_seconds: float = 1 / SPINS_PER_SECOND,
):
self._message = message
if file is None:
@@ -136,6 +152,66 @@ def open_spinner(message: str) -> Generator[SpinnerInterface, None, None]:
spinner.finish("done")
+class _PipRichSpinner:
+ """
+ Custom rich spinner that matches the style of the legacy spinners.
+
+ (*) Updates will be handled in a background thread by a rich live panel
+ which will call render() automatically at the appropriate time.
+ """
+
+ def __init__(self, label: str) -> None:
+ self.label = label
+ self._spin_cycle = itertools.cycle(SPINNER_CHARS)
+ self._spinner_text = ""
+ self._finished = False
+ self._indent = get_indentation() * " "
+
+ def __rich_console__(
+ self, console: Console, options: ConsoleOptions
+ ) -> RenderResult:
+ yield self.render()
+
+ def __rich_measure__(
+ self, console: Console, options: ConsoleOptions
+ ) -> Measurement:
+ text = self.render()
+ return Measurement.get(console, options, text)
+
+ def render(self) -> RenderableType:
+ if not self._finished:
+ self._spinner_text = next(self._spin_cycle)
+
+ return Text.assemble(self._indent, self.label, " ... ", self._spinner_text)
+
+ def finish(self, status: str) -> None:
+ """Stop spinning and set a final status message."""
+ self._spinner_text = status
+ self._finished = True
+
+
+@contextlib.contextmanager
+def open_rich_spinner(label: str, console: Console | None = None) -> Generator[None]:
+ if not logger.isEnabledFor(logging.INFO):
+ # Don't show spinner if --quiet is given.
+ yield
+ return
+
+ console = console or get_console()
+ spinner = _PipRichSpinner(label)
+ with Live(spinner, refresh_per_second=SPINS_PER_SECOND, console=console):
+ try:
+ yield
+ except KeyboardInterrupt:
+ spinner.finish("canceled")
+ raise
+ except Exception:
+ spinner.finish("error")
+ raise
+ else:
+ spinner.finish("done")
+
+
HIDE_CURSOR = "\x1b[?25l"
SHOW_CURSOR = "\x1b[?25h"
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/commands/__init__.py
index 858a41014..bedeca9e9 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/__init__.py
@@ -2,9 +2,11 @@
Package containing all pip commands
"""
+from __future__ import annotations
+
import importlib
from collections import namedtuple
-from typing import Any, Dict, Optional
+from typing import Any
from pip._internal.cli.base_command import Command
@@ -17,12 +19,17 @@
# Even though the module path starts with the same "pip._internal.commands"
# prefix, the full path makes testing easier (specifically when modifying
# `commands_dict` in test setup / teardown).
-commands_dict: Dict[str, CommandInfo] = {
+commands_dict: dict[str, CommandInfo] = {
"install": CommandInfo(
"pip._internal.commands.install",
"InstallCommand",
"Install packages.",
),
+ "lock": CommandInfo(
+ "pip._internal.commands.lock",
+ "LockCommand",
+ "Generate a lock file.",
+ ),
"download": CommandInfo(
"pip._internal.commands.download",
"DownloadCommand",
@@ -118,7 +125,7 @@ def create_command(name: str, **kwargs: Any) -> Command:
return command
-def get_similar_commands(name: str) -> Optional[str]:
+def get_similar_commands(name: str) -> str | None:
"""Command name auto-correct."""
from difflib import get_close_matches
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/cache.py b/addons/source-python/packages/site-packages/pip/_internal/commands/cache.py
index ad65641ed..862740f49 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/cache.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/cache.py
@@ -1,7 +1,7 @@
import os
import textwrap
from optparse import Values
-from typing import Any, List
+from typing import Callable
from pip._internal.cli.base_command import Command
from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -49,8 +49,8 @@ def add_options(self) -> None:
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
- handlers = {
+ def handler_map(self) -> dict[str, Callable[[Values, list[str]], None]]:
+ return {
"dir": self.get_cache_dir,
"info": self.get_cache_info,
"list": self.list_cache_items,
@@ -58,15 +58,18 @@ def run(self, options: Values, args: List[str]) -> int:
"purge": self.purge_cache,
}
+ def run(self, options: Values, args: list[str]) -> int:
+ handler_map = self.handler_map()
+
if not options.cache_dir:
logger.error("pip cache commands can not function since cache is disabled.")
return ERROR
# Determine action
- if not args or args[0] not in handlers:
+ if not args or args[0] not in handler_map:
logger.error(
"Need an action (%s) to perform.",
- ", ".join(sorted(handlers)),
+ ", ".join(sorted(handler_map)),
)
return ERROR
@@ -74,20 +77,20 @@ def run(self, options: Values, args: List[str]) -> int:
# Error handling happens here, not in the action-handlers.
try:
- handlers[action](options, args[1:])
+ handler_map[action](options, args[1:])
except PipError as e:
logger.error(e.args[0])
return ERROR
return SUCCESS
- def get_cache_dir(self, options: Values, args: List[Any]) -> None:
+ def get_cache_dir(self, options: Values, args: list[str]) -> None:
if args:
raise CommandError("Too many arguments")
logger.info(options.cache_dir)
- def get_cache_info(self, options: Values, args: List[Any]) -> None:
+ def get_cache_info(self, options: Values, args: list[str]) -> None:
if args:
raise CommandError("Too many arguments")
@@ -129,7 +132,7 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None:
logger.info(message)
- def list_cache_items(self, options: Values, args: List[Any]) -> None:
+ def list_cache_items(self, options: Values, args: list[str]) -> None:
if len(args) > 1:
raise CommandError("Too many arguments")
@@ -144,7 +147,7 @@ def list_cache_items(self, options: Values, args: List[Any]) -> None:
else:
self.format_for_abspath(files)
- def format_for_human(self, files: List[str]) -> None:
+ def format_for_human(self, files: list[str]) -> None:
if not files:
logger.info("No locally built wheels cached.")
return
@@ -157,11 +160,11 @@ def format_for_human(self, files: List[str]) -> None:
logger.info("Cache contents:\n")
logger.info("\n".join(sorted(results)))
- def format_for_abspath(self, files: List[str]) -> None:
+ def format_for_abspath(self, files: list[str]) -> None:
if files:
logger.info("\n".join(sorted(files)))
- def remove_cache_items(self, options: Values, args: List[Any]) -> None:
+ def remove_cache_items(self, options: Values, args: list[str]) -> None:
if len(args) > 1:
raise CommandError("Too many arguments")
@@ -186,9 +189,33 @@ def remove_cache_items(self, options: Values, args: List[Any]) -> None:
bytes_removed += os.stat(filename).st_size
os.unlink(filename)
logger.verbose("Removed %s", filename)
+
+ http_dirs = filesystem.subdirs_without_files(self._cache_dir(options, "http"))
+ wheel_dirs = filesystem.subdirs_without_wheels(
+ self._cache_dir(options, "wheels")
+ )
+ dirs = [*http_dirs, *wheel_dirs]
+
+ for subdir in dirs:
+ try:
+ for file in subdir.iterdir():
+ file.unlink(missing_ok=True)
+ subdir.rmdir()
+ except FileNotFoundError:
+ # If the directory is already gone, that's fine.
+ pass
+ logger.verbose("Removed %s", subdir)
+
+ # selfcheck.json is no longer used by pip.
+ selfcheck_json = self._cache_dir(options, "selfcheck.json")
+ if os.path.isfile(selfcheck_json):
+ os.remove(selfcheck_json)
+ logger.verbose("Removed legacy selfcheck.json file")
+
logger.info("Files removed: %s (%s)", len(files), format_size(bytes_removed))
+ logger.info("Directories removed: %s", len(dirs))
- def purge_cache(self, options: Values, args: List[Any]) -> None:
+ def purge_cache(self, options: Values, args: list[str]) -> None:
if args:
raise CommandError("Too many arguments")
@@ -197,14 +224,14 @@ def purge_cache(self, options: Values, args: List[Any]) -> None:
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]:
+ def _find_http_files(self, options: Values) -> list[str]:
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]:
+ def _find_wheels(self, options: Values, pattern: str) -> list[str]:
wheel_dir = self._cache_dir(options, "wheels")
# The wheel filename format, as specified in PEP 427, is:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/check.py b/addons/source-python/packages/site-packages/pip/_internal/commands/check.py
index f54a16dc0..516757eea 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/check.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/check.py
@@ -1,6 +1,5 @@
import logging
from optparse import Values
-from typing import List
from pip._internal.cli.base_command import Command
from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -23,7 +22,7 @@ class CheckCommand(Command):
usage = """
%prog [options]"""
- def run(self, options: Values, args: List[str]) -> int:
+ 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(
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/completion.py b/addons/source-python/packages/site-packages/pip/_internal/commands/completion.py
index 9e89e2798..7ba205d72 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/completion.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/completion.py
@@ -1,7 +1,6 @@
import sys
import textwrap
from optparse import Values
-from typing import List
from pip._internal.cli.base_command import Command
from pip._internal.cli.status_codes import SUCCESS
@@ -15,9 +14,10 @@
"bash": """
_pip_completion()
{{
+ local IFS=$' \\t\\n'
COMPREPLY=( $( COMP_WORDS="${{COMP_WORDS[*]}}" \\
COMP_CWORD=$COMP_CWORD \\
- PIP_AUTO_COMPLETE=1 $1 2>/dev/null ) )
+ PIP_AUTO_COMPLETE=1 "$1" 2>/dev/null ) )
}}
complete -o default -F _pip_completion {prog}
""",
@@ -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}
""",
@@ -113,7 +119,7 @@ def add_options(self) -> None:
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
"""Prints the completion code of the given shell"""
shells = COMPLETION_SCRIPTS.keys()
shell_options = ["--" + shell for shell in sorted(shells)]
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/configuration.py b/addons/source-python/packages/site-packages/pip/_internal/commands/configuration.py
index 1a1dc6b6c..7bcea0434 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/configuration.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/configuration.py
@@ -1,8 +1,10 @@
+from __future__ import annotations
+
import logging
import os
import subprocess
from optparse import Values
-from typing import Any, List, Optional
+from typing import Any, Callable
from pip._internal.cli.base_command import Command
from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -93,8 +95,8 @@ def add_options(self) -> None:
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
- handlers = {
+ def handler_map(self) -> dict[str, Callable[[Values, list[str]], None]]:
+ return {
"list": self.list_values,
"edit": self.open_in_editor,
"get": self.get_name,
@@ -103,11 +105,14 @@ def run(self, options: Values, args: List[str]) -> int:
"debug": self.list_config_values,
}
+ def run(self, options: Values, args: list[str]) -> int:
+ handler_map = self.handler_map()
+
# Determine action
- if not args or args[0] not in handlers:
+ if not args or args[0] not in handler_map:
logger.error(
"Need an action (%s) to perform.",
- ", ".join(sorted(handlers)),
+ ", ".join(sorted(handler_map)),
)
return ERROR
@@ -131,14 +136,14 @@ def run(self, options: Values, args: List[str]) -> int:
# Error handling happens here, not in the action-handlers.
try:
- handlers[action](options, args[1:])
+ handler_map[action](options, args[1:])
except PipError as e:
logger.error(e.args[0])
return ERROR
return SUCCESS
- def _determine_file(self, options: Values, need_value: bool) -> Optional[Kind]:
+ def _determine_file(self, options: Values, need_value: bool) -> Kind | None:
file_options = [
key
for key, value in (
@@ -168,31 +173,32 @@ def _determine_file(self, options: Values, need_value: bool) -> Optional[Kind]:
"(--user, --site, --global) to perform."
)
- def list_values(self, options: Values, args: List[str]) -> None:
+ def list_values(self, options: Values, args: list[str]) -> None:
self._get_n_args(args, "list", n=0)
for key, value in sorted(self.configuration.items()):
- write_output("%s=%r", key, value)
+ for key, value in sorted(value.items()):
+ write_output("%s=%r", key, value)
- def get_name(self, options: Values, args: List[str]) -> None:
+ def get_name(self, options: Values, args: list[str]) -> None:
key = self._get_n_args(args, "get [name]", n=1)
value = self.configuration.get_value(key)
write_output("%s", value)
- def set_name_value(self, options: Values, args: List[str]) -> None:
+ def set_name_value(self, options: Values, args: list[str]) -> None:
key, value = self._get_n_args(args, "set [name] [value]", n=2)
self.configuration.set_value(key, value)
self._save_configuration()
- def unset_name(self, options: Values, args: List[str]) -> None:
+ def unset_name(self, options: Values, args: list[str]) -> None:
key = self._get_n_args(args, "unset [name]", n=1)
self.configuration.unset_value(key)
self._save_configuration()
- def list_config_values(self, options: Values, args: List[str]) -> None:
+ def list_config_values(self, options: Values, args: list[str]) -> None:
"""List config key-value pairs across different config files"""
self._get_n_args(args, "debug", n=0)
@@ -206,13 +212,15 @@ def list_config_values(self, options: Values, args: List[str]) -> None:
file_exists = os.path.exists(fname)
write_output("%s, exists: %r", fname, file_exists)
if file_exists:
- self.print_config_file_values(variant)
+ self.print_config_file_values(variant, fname)
- def print_config_file_values(self, variant: Kind) -> None:
+ def print_config_file_values(self, variant: Kind, fname: str) -> None:
"""Get key-value pairs from the file of a variant"""
for name, value in self.configuration.get_values_in_config(variant).items():
with indent_log():
- write_output("%s: %s", name, value)
+ if name == fname:
+ for confname, confvalue in value.items():
+ write_output("%s: %s", confname, confvalue)
def print_env_var_values(self) -> None:
"""Get key-values pairs present as environment variables"""
@@ -222,7 +230,7 @@ def print_env_var_values(self) -> None:
env_var = f"PIP_{key.upper()}"
write_output("%s=%r", env_var, value)
- def open_in_editor(self, options: Values, args: List[str]) -> None:
+ def open_in_editor(self, options: Values, args: list[str]) -> None:
editor = self._determine_editor(options)
fname = self.configuration.get_file_to_edit()
@@ -244,7 +252,7 @@ def open_in_editor(self, options: Values, args: List[str]) -> None:
except subprocess.CalledProcessError as e:
raise PipError(f"Editor Subprocess exited with exit code {e.returncode}")
- def _get_n_args(self, args: List[str], example: str, n: int) -> Any:
+ 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 = (
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/debug.py b/addons/source-python/packages/site-packages/pip/_internal/commands/debug.py
index 567ca967e..0e187e79c 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/debug.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/debug.py
@@ -1,10 +1,12 @@
+from __future__ import annotations
+
import locale
import logging
import os
import sys
from optparse import Values
from types import ModuleType
-from typing import Any, Dict, List, Optional
+from typing import Any
import pip._vendor
from pip._vendor.certifi import where
@@ -34,7 +36,7 @@ def show_sys_implementation() -> None:
show_value("name", implementation_name)
-def create_vendor_txt_map() -> Dict[str, str]:
+def create_vendor_txt_map() -> dict[str, str]:
with open_text_resource("pip._vendor", "vendor.txt") as f:
# Purge non version specifying lines.
# Also, remove any space prefix or suffixes (including comments).
@@ -46,7 +48,7 @@ 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) -> Optional[ModuleType]:
+def get_module_from_module_name(module_name: str) -> ModuleType | None:
# Module name can be uppercase in vendor.txt for some reason...
module_name = module_name.lower().replace("-", "_")
# PATCH: setuptools is actually only pkg_resources.
@@ -64,7 +66,7 @@ def get_module_from_module_name(module_name: str) -> Optional[ModuleType]:
raise
-def get_vendor_version_from_module(module_name: str) -> Optional[str]:
+def get_vendor_version_from_module(module_name: str) -> str | None:
module = get_module_from_module_name(module_name)
version = getattr(module, "__version__", None)
@@ -79,7 +81,7 @@ def get_vendor_version_from_module(module_name: str) -> Optional[str]:
return version
-def show_actual_vendor_versions(vendor_txt_versions: Dict[str, str]) -> None:
+def show_actual_vendor_versions(vendor_txt_versions: dict[str, str]) -> None:
"""Log the actual version and print extra info if there is
a conflict or if the actual version could not be imported.
"""
@@ -169,7 +171,7 @@ def add_options(self) -> None:
self.parser.insert_option_group(0, self.cmd_opts)
self.parser.config.load()
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
logger.warning(
"This command is only meant for debugging. "
"Do not use this with automation for parsing and getting these "
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/download.py b/addons/source-python/packages/site-packages/pip/_internal/commands/download.py
index 917bbb91d..5c0a3a51d 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/download.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/download.py
@@ -1,14 +1,12 @@
import logging
import os
from optparse import Values
-from typing import List
from pip._internal.cli import cmdoptions
from pip._internal.cli.cmdoptions import make_target_python
from pip._internal.cli.req_command import RequirementCommand, with_cleanup
from pip._internal.cli.status_codes import SUCCESS
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.misc import ensure_dir, normalize_path, write_output
from pip._internal.utils.temp_dir import TempDirectory
@@ -37,19 +35,15 @@ class DownloadCommand(RequirementCommand):
def add_options(self) -> None:
self.cmd_opts.add_option(cmdoptions.constraints())
+ self.cmd_opts.add_option(cmdoptions.build_constraints())
self.cmd_opts.add_option(cmdoptions.requirements())
+ self.cmd_opts.add_option(cmdoptions.requirements_from_scripts())
self.cmd_opts.add_option(cmdoptions.no_deps())
- self.cmd_opts.add_option(cmdoptions.global_options())
- 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.src())
- self.cmd_opts.add_option(cmdoptions.pre())
self.cmd_opts.add_option(cmdoptions.require_hashes())
self.cmd_opts.add_option(cmdoptions.progress_bar())
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.ignore_requires_python())
@@ -71,17 +65,25 @@ def add_options(self) -> None:
self.parser,
)
+ selection_opts = cmdoptions.make_option_group(
+ cmdoptions.package_selection_group,
+ self.parser,
+ )
+
self.parser.insert_option_group(0, index_opts)
+ self.parser.insert_option_group(0, selection_opts)
self.parser.insert_option_group(0, self.cmd_opts)
@with_cleanup
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
options.ignore_installed = True
# editable doesn't really make sense for `pip download`, but the bowels
# of the RequirementSet code require that property.
options.editables = []
cmdoptions.check_dist_restriction(options)
+ cmdoptions.check_build_constraints(options)
+ cmdoptions.check_release_control_exclusive(options)
options.download_dir = normalize_path(options.download_dir)
ensure_dir(options.download_dir)
@@ -105,7 +107,6 @@ def run(self, options: Values, args: List[str]) -> int:
)
reqs = self.get_requirements(args, options, finder, session)
- check_legacy_setup_py_options(options, reqs)
preparer = self.make_requirement_preparer(
temp_build_dir=directory,
@@ -123,7 +124,6 @@ def run(self, options: Values, args: List[str]) -> int:
finder=finder,
options=options,
ignore_requires_python=options.ignore_requires_python,
- use_pep517=options.use_pep517,
py_version_info=options.python_version,
)
@@ -131,15 +131,15 @@ def run(self, options: Values, args: List[str]) -> int:
requirement_set = resolver.resolve(reqs, check_supported_wheels=True)
- downloaded: List[str] = []
+ preparer.prepare_linked_requirements_more(requirement_set.requirements.values())
+
+ downloaded: list[str] = []
for req in requirement_set.requirements.values():
if req.satisfied_by is None:
assert req.name is not None
preparer.save_linked_requirement(req)
downloaded.append(req.name)
- preparer.prepare_linked_requirements_more(requirement_set.requirements.values())
-
if downloaded:
write_output("Successfully downloaded %s", " ".join(downloaded))
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/freeze.py b/addons/source-python/packages/site-packages/pip/_internal/commands/freeze.py
index 885fdfeb8..7794857cf 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/freeze.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/freeze.py
@@ -1,6 +1,5 @@
import sys
from optparse import Values
-from typing import AbstractSet, List
from pip._internal.cli import cmdoptions
from pip._internal.cli.base_command import Command
@@ -13,7 +12,7 @@ def _should_suppress_build_backends() -> bool:
return sys.version_info < (3, 12)
-def _dev_pkgs() -> AbstractSet[str]:
+def _dev_pkgs() -> set[str]:
pkgs = {"pip"}
if _should_suppress_build_backends():
@@ -32,7 +31,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(
@@ -86,7 +84,7 @@ def add_options(self) -> None:
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
skip = set(stdlib_pkgs)
if not options.freeze_all:
skip.update(_dev_pkgs())
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/hash.py b/addons/source-python/packages/site-packages/pip/_internal/commands/hash.py
index 042dac813..271a4c91a 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/hash.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/hash.py
@@ -2,7 +2,6 @@
import logging
import sys
from optparse import Values
-from typing import List
from pip._internal.cli.base_command import Command
from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -37,7 +36,7 @@ def add_options(self) -> None:
)
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
if not args:
self.parser.print_usage(sys.stderr)
return ERROR
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/help.py b/addons/source-python/packages/site-packages/pip/_internal/commands/help.py
index 62066318b..2ae658ff5 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/help.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/help.py
@@ -1,5 +1,4 @@
from optparse import Values
-from typing import List
from pip._internal.cli.base_command import Command
from pip._internal.cli.status_codes import SUCCESS
@@ -13,7 +12,7 @@ class HelpCommand(Command):
%prog """
ignore_require_venv = True
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
from pip._internal.commands import (
commands_dict,
create_command,
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/index.py b/addons/source-python/packages/site-packages/pip/_internal/commands/index.py
index 2e2661bba..40b8f580f 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/index.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/index.py
@@ -1,13 +1,21 @@
+from __future__ import annotations
+
+import json
import logging
+from collections.abc import Iterable
from optparse import Values
-from typing import Any, Iterable, List, Optional
+from typing import Any, Callable
+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
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,
+)
from pip._internal.exceptions import CommandError, DistributionNotFound, PipError
from pip._internal.index.collector import LinkCollector
from pip._internal.index.package_finder import PackageFinder
@@ -33,34 +41,37 @@ def add_options(self) -> None:
cmdoptions.add_target_python_options(self.cmd_opts)
self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
- self.cmd_opts.add_option(cmdoptions.pre())
- self.cmd_opts.add_option(cmdoptions.no_binary())
- self.cmd_opts.add_option(cmdoptions.only_binary())
+ self.cmd_opts.add_option(cmdoptions.json())
index_opts = cmdoptions.make_option_group(
cmdoptions.index_group,
self.parser,
)
+ selection_opts = cmdoptions.make_option_group(
+ cmdoptions.package_selection_group,
+ self.parser,
+ )
+
self.parser.insert_option_group(0, index_opts)
+ self.parser.insert_option_group(0, selection_opts)
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
- handlers = {
+ def handler_map(self) -> dict[str, Callable[[Values, list[str]], None]]:
+ return {
"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."
- )
+ def run(self, options: Values, args: list[str]) -> int:
+ cmdoptions.check_release_control_exclusive(options)
+
+ handler_map = self.handler_map()
# Determine action
- if not args or args[0] not in handlers:
+ if not args or args[0] not in handler_map:
logger.error(
"Need an action (%s) to perform.",
- ", ".join(sorted(handlers)),
+ ", ".join(sorted(handler_map)),
)
return ERROR
@@ -68,7 +79,7 @@ def run(self, options: Values, args: List[str]) -> int:
# Error handling happens here, not in the action-handlers.
try:
- handlers[action](options, args[1:])
+ handler_map[action](options, args[1:])
except PipError as e:
logger.error(e.args[0])
return ERROR
@@ -79,8 +90,8 @@ def _build_package_finder(
self,
options: Values,
session: PipSession,
- target_python: Optional[TargetPython] = None,
- ignore_requires_python: Optional[bool] = None,
+ target_python: TargetPython | None = None,
+ ignore_requires_python: bool | None = None,
) -> PackageFinder:
"""
Create a package finder appropriate to the index command.
@@ -90,7 +101,8 @@ def _build_package_finder(
# Pass allow_yanked=False to ignore yanked versions.
selection_prefs = SelectionPreferences(
allow_yanked=False,
- allow_all_prereleases=options.pre,
+ release_control=options.release_control,
+ format_control=options.format_control,
ignore_requires_python=ignore_requires_python,
)
@@ -98,9 +110,10 @@ def _build_package_finder(
link_collector=link_collector,
selection_prefs=selection_prefs,
target_python=target_python,
+ uploaded_prior_to=options.uploaded_prior_to,
)
- def get_available_package_versions(self, options: Values, args: List[Any]) -> None:
+ def get_available_package_versions(self, options: Values, args: list[Any]) -> None:
if len(args) != 1:
raise CommandError("You need to specify exactly one argument")
@@ -119,8 +132,7 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
candidate.version for candidate in finder.find_all_candidates(query)
)
- if not options.pre:
- # Remove prereleases
+ if self.should_exclude_prerelease(options, canonicalize_name(query)):
versions = (
version for version in versions if not version.is_prerelease
)
@@ -134,6 +146,21 @@ 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]
- write_output(f"{query} ({latest})")
- write_output("Available versions: {}".format(", ".join(formatted_versions)))
- print_dist_installation_info(query, latest)
+ dist = get_installed_distribution(query)
+
+ if options.json:
+ structured_output = {
+ "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))
+
+ else:
+ write_output(f"{query} ({latest})")
+ write_output("Available versions: {}".format(", ".join(formatted_versions)))
+ print_dist_installation_info(latest, dist)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/inspect.py b/addons/source-python/packages/site-packages/pip/_internal/commands/inspect.py
index e810c1316..e262012ee 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/inspect.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/inspect.py
@@ -1,6 +1,6 @@
import logging
from optparse import Values
-from typing import Any, Dict, List
+from typing import Any
from pip._vendor.packaging.markers import default_environment
from pip._vendor.rich import print_json
@@ -45,7 +45,7 @@ def add_options(self) -> None:
self.cmd_opts.add_option(cmdoptions.list_path())
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
cmdoptions.check_list_path_option(options)
dists = get_environment(options.path).iter_installed_distributions(
local_only=options.local,
@@ -62,8 +62,8 @@ def run(self, options: Values, args: List[str]) -> int:
print_json(data=output)
return SUCCESS
- def _dist_to_dict(self, dist: BaseDistribution) -> Dict[str, Any]:
- res: Dict[str, Any] = {
+ def _dist_to_dict(self, dist: BaseDistribution) -> dict[str, Any]:
+ res: dict[str, Any] = {
"metadata": dist.metadata_dict,
"metadata_location": dist.info_location,
}
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/install.py b/addons/source-python/packages/site-packages/pip/_internal/commands/install.py
index 232a34a6d..8c3d86648 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/install.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/install.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import errno
import json
import operator
@@ -5,9 +7,10 @@
import shutil
import site
from optparse import SUPPRESS_HELP, Values
-from typing import List, Optional
+from pathlib import Path
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,
@@ -25,16 +28,19 @@
with_cleanup,
)
from pip._internal.cli.status_codes import ERROR, SUCCESS
-from pip._internal.exceptions import CommandError, InstallationError
+from pip._internal.exceptions import (
+ CommandError,
+ InstallationError,
+ InstallWheelBuildError,
+)
from pip._internal.locations import get_scheme
-from pip._internal.metadata import get_environment
+from pip._internal.metadata import BaseEnvironment, get_environment
from pip._internal.models.installation_report import InstallationReport
from pip._internal.operations.build.build_tracker import get_build_tracker
from pip._internal.operations.check import ConflictDetails, check_install_conflicts
-from pip._internal.req import install_given_reqs
+from pip._internal.req import InstallationResult, install_given_reqs
from pip._internal.req.req_install import (
InstallRequirement,
- check_legacy_setup_py_options,
)
from pip._internal.utils.compat import WINDOWS
from pip._internal.utils.filesystem import test_writable_dir
@@ -52,7 +58,7 @@
running_under_virtualenv,
virtualenv_no_global,
)
-from pip._internal.wheel_builder import build, should_build_for_install_command
+from pip._internal.wheel_builder import build
logger = getLogger(__name__)
@@ -80,8 +86,9 @@ class InstallCommand(RequirementCommand):
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.build_constraints())
+ self.cmd_opts.add_option(cmdoptions.requirements_from_scripts())
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(
@@ -203,12 +210,10 @@ def add_options(self) -> None:
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.override_externally_managed())
self.cmd_opts.add_option(cmdoptions.config_settings())
- self.cmd_opts.add_option(cmdoptions.global_options())
self.cmd_opts.add_option(
"--compile",
@@ -239,9 +244,6 @@ def add_options(self) -> None:
default=True,
help="Do not warn about broken dependencies",
)
- 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())
self.cmd_opts.add_option(cmdoptions.root_user_action())
@@ -251,7 +253,13 @@ def add_options(self) -> None:
self.parser,
)
+ selection_opts = cmdoptions.make_option_group(
+ cmdoptions.package_selection_group,
+ self.parser,
+ )
+
self.parser.insert_option_group(0, index_opts)
+ self.parser.insert_option_group(0, selection_opts)
self.parser.insert_option_group(0, self.cmd_opts)
self.cmd_opts.add_option(
@@ -271,7 +279,7 @@ def add_options(self) -> None:
)
@with_cleanup
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
if options.use_user_site and options.target_dir is not None:
raise CommandError("Can not combine '--user' and '--target'")
@@ -296,7 +304,9 @@ def run(self, options: Values, args: List[str]) -> int:
if options.upgrade:
upgrade_strategy = options.upgrade_strategy
+ cmdoptions.check_build_constraints(options)
cmdoptions.check_dist_restriction(options, check_target=True)
+ cmdoptions.check_release_control_exclusive(options)
logger.verbose("Using %s", get_pip_version())
options.use_user_site = decide_user_install(
@@ -307,8 +317,8 @@ def run(self, options: Values, args: List[str]) -> int:
isolated_mode=options.isolated_mode,
)
- target_temp_dir: Optional[TempDirectory] = None
- target_temp_dir_path: Optional[str] = None
+ target_temp_dir: TempDirectory | None = None
+ target_temp_dir_path: str | None = None
if options.target_dir:
options.ignore_installed = True
options.target_dir = os.path.abspath(options.target_dir)
@@ -327,8 +337,6 @@ def run(self, options: Values, args: List[str]) -> int:
target_temp_dir_path = target_temp_dir.path
self.enter_context(target_temp_dir)
- global_options = options.global_options or []
-
session = self.get_default_session(options)
target_python = make_target_python(options)
@@ -348,7 +356,6 @@ def run(self, options: Values, args: List[str]) -> int:
try:
reqs = self.get_requirements(args, options, finder, session)
- check_legacy_setup_py_options(options, reqs)
wheel_cache = WheelCache(options.cache_dir)
@@ -377,7 +384,6 @@ def run(self, options: Values, args: List[str]) -> int:
ignore_requires_python=options.ignore_requires_python,
force_reinstall=options.force_reinstall,
upgrade_strategy=upgrade_strategy,
- use_pep517=options.use_pep517,
py_version_info=options.python_version,
)
@@ -407,6 +413,13 @@ def run(self, options: Values, args: List[str]) -> int:
)
return SUCCESS
+ # If there is any more preparation to do for the actual installation, do
+ # so now. This includes actually downloading the files in the case that
+ # we have been using PEP-658 metadata so far.
+ preparer.prepare_linked_requirements_more(
+ requirement_set.requirements.values()
+ )
+
try:
pip_req = requirement_set.get_requirement("pip")
except KeyError:
@@ -418,31 +431,22 @@ def run(self, options: Values, args: List[str]) -> int:
protect_pip_from_modification_on_windows(modifying_pip=modifying_pip)
reqs_to_build = [
- r
- for r in requirement_set.requirements.values()
- if should_build_for_install_command(r)
+ r for r in requirement_set.requirements_to_install if not r.is_wheel
]
_, build_failures = build(
reqs_to_build,
wheel_cache=wheel_cache,
verify=True,
- build_options=[],
- global_options=global_options,
)
if build_failures:
- raise InstallationError(
- "Failed to build installable wheels for some "
- "pyproject.toml based projects ({})".format(
- ", ".join(r.name for r in build_failures) # type: ignore
- )
- )
+ raise InstallWheelBuildError(build_failures)
to_install = resolver.get_installation_order(requirement_set)
# Check for conflicts in the package set we're installing.
- conflicts: Optional[ConflictDetails] = None
+ conflicts: ConflictDetails | None = None
should_warn_about_conflicts = (
not options.ignore_dependencies and options.warn_about_conflicts
)
@@ -457,13 +461,13 @@ def run(self, options: Values, args: List[str]) -> int:
installed = install_given_reqs(
to_install,
- global_options,
root=options.root_path,
home=target_temp_dir_path,
prefix=options.prefix_path,
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(
@@ -475,34 +479,13 @@ 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"))
- 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(
conflicts,
resolver_variant=self.determine_resolver_variant(options),
)
-
- installed_desc = " ".join(summary)
- if installed_desc:
- write_output(
- "Successfully installed %s",
- installed_desc,
- )
+ if summary := installed_packages_summary(installed, env):
+ write_output(summary)
except OSError as error:
show_traceback = self.verbosity >= 1
@@ -579,8 +562,8 @@ def _handle_target_dir(
shutil.move(os.path.join(lib_dir, item), target_item_dir)
def _determine_conflicts(
- self, to_install: List[InstallRequirement]
- ) -> Optional[ConflictDetails]:
+ self, to_install: list[InstallRequirement]
+ ) -> ConflictDetails | None:
try:
return check_install_conflicts(to_install)
except Exception:
@@ -597,7 +580,7 @@ def _warn_about_conflicts(
if not missing and not conflicting:
return
- parts: List[str] = []
+ parts: list[str] = []
if resolver_variant == "legacy":
parts.append(
"pip's legacy dependency resolver does not consider dependency "
@@ -641,13 +624,37 @@ def _warn_about_conflicts(
logger.critical("\n".join(parts))
+def installed_packages_summary(
+ installed: list[InstallationResult], env: BaseEnvironment
+) -> str:
+ # Format 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"))
+ 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 not summary:
+ return ""
+ return f"Successfully installed {' '.join(summary)}"
+
+
def get_lib_location_guesses(
user: bool = False,
- home: Optional[str] = None,
- root: Optional[str] = None,
+ home: str | None = None,
+ root: str | None = None,
isolated: bool = False,
- prefix: Optional[str] = None,
-) -> List[str]:
+ prefix: str | None = None,
+) -> list[str]:
scheme = get_scheme(
"",
user=user,
@@ -659,7 +666,7 @@ def get_lib_location_guesses(
return [scheme.purelib, scheme.platlib]
-def site_packages_writable(root: Optional[str], isolated: bool) -> bool:
+def site_packages_writable(root: str | None, isolated: bool) -> bool:
return all(
test_writable_dir(d)
for d in set(get_lib_location_guesses(root=root, isolated=isolated))
@@ -667,10 +674,10 @@ def site_packages_writable(root: Optional[str], isolated: bool) -> bool:
def decide_user_install(
- use_user_site: Optional[bool],
- prefix_path: Optional[str] = None,
- target_dir: Optional[str] = None,
- root_path: Optional[str] = None,
+ use_user_site: bool | None,
+ prefix_path: str | None = None,
+ target_dir: str | None = None,
+ root_path: str | None = None,
isolated_mode: bool = False,
) -> bool:
"""Determine whether to do a user install based on the input options.
@@ -687,6 +694,7 @@ def decide_user_install(
logger.debug("Non-user install by explicit request")
return False
+ # If we have been asked for a user install explicitly, check compatibility.
if use_user_site:
if prefix_path:
raise CommandError(
@@ -698,6 +706,13 @@ def decide_user_install(
"Can not perform a '--user' install. User site-packages "
"are not visible in this virtualenv."
)
+ # Catch all remaining cases which honour the site.ENABLE_USER_SITE
+ # value, such as a plain Python installation (e.g. no virtualenv).
+ if not site.ENABLE_USER_SITE:
+ raise InstallationError(
+ "Can not perform a '--user' install. User site-packages "
+ "are disabled for this Python."
+ )
logger.debug("User install by explicit request")
return True
@@ -765,20 +780,31 @@ def create_os_error_message(
parts.append(permissions_part)
parts.append(".\n")
- # Suggest the user to enable Long Paths if path length is
- # more than 260
- if (
- WINDOWS
- and error.errno == errno.ENOENT
- and error.filename
- and len(error.filename) > 260
- ):
+ # Suggest to check "pip config debug" in case of invalid proxy
+ if type(error) is InvalidProxyURL:
parts.append(
- "HINT: This error might have occurred since "
- "this system does not have Windows Long Path "
- "support enabled. You can find information on "
- "how to enable this at "
- "https://pip.pypa.io/warnings/enable-long-paths\n"
+ 'Consider checking your local proxy configuration with "pip config debug"'
)
+ parts.append(".\n")
+ # On Windows, errors like EINVAL or ENOENT may occur
+ # if a file or folder name exceeds 255 characters,
+ # or if the full path exceeds 260 characters and long path support isn't enabled.
+ # This condition checks for such cases and adds a hint to the error output.
+
+ if WINDOWS and error.errno in (errno.EINVAL, errno.ENOENT) and error.filename:
+ if any(len(part) > 255 for part in Path(error.filename).parts):
+ parts.append(
+ "HINT: This error might be caused by a file or folder name exceeding "
+ "255 characters, which is a Windows limitation even if long paths "
+ "are enabled.\n "
+ )
+ if len(error.filename) > 260:
+ parts.append(
+ "HINT: This error might have occurred since "
+ "this system does not have Windows Long Path "
+ "support enabled. You can find information on "
+ "how to enable this at "
+ "https://pip.pypa.io/warnings/enable-long-paths\n"
+ )
return "".join(parts).strip() + "\n"
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/list.py b/addons/source-python/packages/site-packages/pip/_internal/commands/list.py
index 849437024..f9bad7e0d 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/list.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/list.py
@@ -1,10 +1,14 @@
+from __future__ import annotations
+
import json
import logging
+from collections.abc import Generator, Sequence
+from email.parser import Parser
from optparse import Values
-from typing import TYPE_CHECKING, Generator, List, Optional, Sequence, Tuple, cast
+from typing import TYPE_CHECKING, cast
from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor.packaging.version import Version
+from pip._vendor.packaging.version import InvalidVersion, Version
from pip._internal.cli import cmdoptions
from pip._internal.cli.index_command import IndexGroupCommand
@@ -86,15 +90,6 @@ def add_options(self) -> None:
help="Only output packages installed in user-site.",
)
self.cmd_opts.add_option(cmdoptions.list_path())
- self.cmd_opts.add_option(
- "--pre",
- action="store_true",
- default=False,
- help=(
- "Include pre-release and development versions. By default, "
- "pip only finds stable versions."
- ),
- )
self.cmd_opts.add_option(
"--format",
@@ -125,13 +120,19 @@ 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())
index_opts = cmdoptions.make_option_group(cmdoptions.index_group, self.parser)
+ selection_opts = cmdoptions.make_option_group(
+ cmdoptions.package_selection_group,
+ self.parser,
+ )
+
self.parser.insert_option_group(0, index_opts)
+ self.parser.insert_option_group(0, selection_opts)
self.parser.insert_option_group(0, self.cmd_opts)
def handle_pip_version_check(self, options: Values) -> None:
@@ -139,8 +140,8 @@ 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.
"""
@@ -153,7 +154,7 @@ def _build_package_finder(
# Pass allow_yanked=False to ignore yanked versions.
selection_prefs = SelectionPreferences(
allow_yanked=False,
- allow_all_prereleases=options.pre,
+ release_control=options.release_control,
)
return PackageFinder.create(
@@ -161,7 +162,9 @@ def _build_package_finder(
selection_prefs=selection_prefs,
)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
+ cmdoptions.check_release_control_exclusive(options)
+
if options.outdated and options.uptodate:
raise CommandError("Options --outdated and --uptodate cannot be combined.")
@@ -203,8 +206,8 @@ def run(self, options: Values, args: List[str]) -> int:
return SUCCESS
def get_outdated(
- self, packages: "_ProcessedDists", options: Values
- ) -> "_ProcessedDists":
+ self, packages: _ProcessedDists, options: Values
+ ) -> _ProcessedDists:
return [
dist
for dist in self.iter_packages_latest_infos(packages, options)
@@ -212,8 +215,8 @@ def get_outdated(
]
def get_uptodate(
- self, packages: "_ProcessedDists", options: Values
- ) -> "_ProcessedDists":
+ self, packages: _ProcessedDists, options: Values
+ ) -> _ProcessedDists:
return [
dist
for dist in self.iter_packages_latest_infos(packages, options)
@@ -221,8 +224,8 @@ def get_uptodate(
]
def get_not_required(
- self, packages: "_ProcessedDists", options: Values
- ) -> "_ProcessedDists":
+ self, packages: _ProcessedDists, options: Values
+ ) -> _ProcessedDists:
dep_keys = {
canonicalize_name(dep.name)
for dist in packages
@@ -235,17 +238,16 @@ def get_not_required(
return list({pkg for pkg in packages if pkg.canonical_name not in dep_keys})
def iter_packages_latest_infos(
- self, packages: "_ProcessedDists", options: Values
- ) -> Generator["_DistWithLatestInfo", None, None]:
+ self, packages: _ProcessedDists, options: Values
+ ) -> Generator[_DistWithLatestInfo, None, None]:
with self._build_session(options) as session:
finder = self._build_package_finder(options, session)
def latest_info(
- dist: "_DistWithLatestInfo",
- ) -> Optional["_DistWithLatestInfo"]:
+ dist: _DistWithLatestInfo,
+ ) -> _DistWithLatestInfo | None:
all_candidates = finder.find_all_candidates(dist.canonical_name)
- if not options.pre:
- # Remove prereleases
+ if self.should_exclude_prerelease(options, dist.canonical_name):
all_candidates = [
candidate
for candidate in all_candidates
@@ -273,7 +275,7 @@ def latest_info(
yield dist
def output_package_listing(
- self, packages: "_ProcessedDists", options: Values
+ self, packages: _ProcessedDists, options: Values
) -> None:
packages = sorted(
packages,
@@ -284,17 +286,19 @@ def output_package_listing(
self.output_package_listing_columns(data, header)
elif options.list_format == "freeze":
for dist in packages:
+ try:
+ req_string = f"{dist.raw_name}=={dist.version}"
+ except InvalidVersion:
+ req_string = f"{dist.raw_name}==={dist.raw_version}"
if options.verbose >= 1:
- write_output(
- "%s==%s (%s)", dist.raw_name, dist.version, dist.location
- )
+ write_output("%s (%s)", req_string, dist.location)
else:
- write_output("%s==%s", dist.raw_name, dist.version)
+ write_output(req_string)
elif options.list_format == "json":
write_output(format_for_json(packages, options))
def output_package_listing_columns(
- self, data: List[List[str]], header: List[str]
+ self, data: list[list[str]], header: list[str]
) -> None:
# insert the header first: we need to know the size of column names
if len(data) > 0:
@@ -311,8 +315,8 @@ def output_package_listing_columns(
def format_for_columns(
- pkgs: "_ProcessedDists", options: Values
-) -> Tuple[List[List[str]], List[str]]:
+ pkgs: _ProcessedDists, options: Values
+) -> tuple[list[list[str]], list[str]]:
"""
Convert the package data into something usable
by output_package_listing_columns.
@@ -323,6 +327,18 @@ def format_for_columns(
if running_outdated:
header.extend(["Latest", "Type"])
+ def wheel_build_tag(dist: BaseDistribution) -> str | None:
+ 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")
+
has_editables = any(x.editable for x in pkgs)
if has_editables:
header.append("Editable project location")
@@ -333,7 +349,7 @@ def format_for_columns(
header.append("Installer")
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 +358,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 "")
@@ -355,12 +374,16 @@ def format_for_columns(
return data, header
-def format_for_json(packages: "_ProcessedDists", options: Values) -> str:
+def format_for_json(packages: _ProcessedDists, options: Values) -> str:
data = []
for dist in packages:
+ try:
+ version = str(dist.version)
+ except InvalidVersion:
+ version = dist.raw_version
info = {
"name": dist.raw_name,
- "version": str(dist.version),
+ "version": version,
}
if options.verbose >= 1:
info["location"] = dist.location or ""
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/lock.py b/addons/source-python/packages/site-packages/pip/_internal/commands/lock.py
new file mode 100644
index 000000000..9a55349e6
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/lock.py
@@ -0,0 +1,175 @@
+import sys
+from optparse import Values
+from pathlib import Path
+
+from pip._vendor import tomli_w
+from pip._vendor.packaging.pylock import is_valid_pylock_path
+
+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.operations.build.build_tracker import get_build_tracker
+from pip._internal.utils.logging import getLogger
+from pip._internal.utils.misc import (
+ get_pip_version,
+)
+from pip._internal.utils.pylock import pylock_from_install_requirements
+from pip._internal.utils.temp_dir import TempDirectory
+
+logger = getLogger(__name__)
+
+
+class LockCommand(RequirementCommand):
+ """
+ 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.
+
+ 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] ..."""
+
+ 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.requirements_from_scripts())
+ self.cmd_opts.add_option(cmdoptions.constraints())
+ self.cmd_opts.add_option(cmdoptions.build_constraints())
+ self.cmd_opts.add_option(cmdoptions.no_deps())
+
+ 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.check_build_deps())
+
+ self.cmd_opts.add_option(cmdoptions.config_settings())
+
+ 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,
+ )
+
+ selection_opts = cmdoptions.make_option_group(
+ cmdoptions.package_selection_group,
+ self.parser,
+ )
+
+ self.parser.insert_option_group(0, index_opts)
+ self.parser.insert_option_group(0, selection_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())
+
+ logger.warning(
+ "pip lock is currently an experimental command. "
+ "It may be removed/changed in a future release "
+ "without prior warning."
+ )
+
+ cmdoptions.check_build_constraints(options)
+ cmdoptions.check_release_control_exclusive(options)
+
+ 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)
+
+ 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",
+ )
+
+ self.trace_basic_info(finder)
+
+ requirement_set = resolver.resolve(reqs, check_supported_wheels=True)
+
+ if options.output_file == "-":
+ base_dir = Path.cwd()
+ else:
+ output_file_path = Path(options.output_file)
+ if not is_valid_pylock_path(output_file_path):
+ logger.warning(
+ "%s is not a valid lock file name.",
+ output_file_path,
+ )
+ base_dir = output_file_path.parent
+ pylock = pylock_from_install_requirements(
+ requirement_set.requirements.values(), base_dir=base_dir
+ )
+ pylock_toml = tomli_w.dumps(pylock.to_dict())
+ 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/addons/source-python/packages/site-packages/pip/_internal/commands/search.py b/addons/source-python/packages/site-packages/pip/_internal/commands/search.py
index 74b8d656b..b8dbc27d3 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/search.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/search.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import logging
import shutil
import sys
@@ -5,7 +7,7 @@
import xmlrpc.client
from collections import OrderedDict
from optparse import Values
-from typing import TYPE_CHECKING, Dict, List, Optional, TypedDict
+from typing import TypedDict
from pip._vendor.packaging.version import parse as parse_version
@@ -14,17 +16,17 @@
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
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__)
@@ -49,7 +51,7 @@ def add_options(self) -> None:
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
if not args:
raise CommandError("Missing required argument (search query).")
query = args
@@ -65,7 +67,7 @@ def run(self, options: Values, args: List[str]) -> int:
return SUCCESS
return NO_MATCHES_FOUND
- def search(self, query: List[str], options: Values) -> List[Dict[str, str]]:
+ def search(self, query: list[str], options: Values) -> list[dict[str, str]]:
index_url = options.index
session = self.get_default_session(options)
@@ -83,13 +85,13 @@ def search(self, query: List[str], options: Values) -> List[Dict[str, str]]:
return hits
-def transform_hits(hits: List[Dict[str, str]]) -> List["TransformedHit"]:
+def transform_hits(hits: list[dict[str, str]]) -> list[TransformedHit]:
"""
The list from pypi is really a list of versions. We want a list of
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"]
@@ -111,9 +113,7 @@ 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(latest: str, dist: BaseDistribution | None) -> None:
if dist is not None:
with indent_log():
if dist.version == latest:
@@ -130,10 +130,15 @@ def print_dist_installation_info(name: str, latest: str) -> None:
write_output("LATEST: %s", latest)
+def get_installed_distribution(name: str) -> BaseDistribution | None:
+ env = get_default_environment()
+ return env.get_distribution(name)
+
+
def print_results(
- hits: List["TransformedHit"],
- name_column_width: Optional[int] = None,
- terminal_width: Optional[int] = None,
+ hits: list[TransformedHit],
+ name_column_width: int | None = None,
+ terminal_width: int | None = None,
) -> None:
if not hits:
return
@@ -163,10 +168,11 @@ 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(latest, dist)
except UnicodeEncodeError:
pass
-def highest_version(versions: List[str]) -> str:
+def highest_version(versions: list[str]) -> str:
return max(versions, key=parse_version)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/show.py b/addons/source-python/packages/site-packages/pip/_internal/commands/show.py
index b47500cf8..f9fcfa60b 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/show.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/show.py
@@ -1,6 +1,10 @@
+from __future__ import annotations
+
import logging
+import string
+from collections.abc import Generator, Iterable, Iterator
from optparse import Values
-from typing import Generator, Iterable, Iterator, List, NamedTuple, Optional
+from typing import NamedTuple
from pip._vendor.packaging.requirements import InvalidRequirement
from pip._vendor.packaging.utils import canonicalize_name
@@ -13,6 +17,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.
@@ -36,7 +47,7 @@ def add_options(self) -> None:
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
if not args:
logger.warning("ERROR: Please provide a package name or names.")
return ERROR
@@ -54,24 +65,24 @@ class _PackageInfo(NamedTuple):
name: str
version: str
location: str
- editable_project_location: Optional[str]
- requires: List[str]
- required_by: List[str]
+ editable_project_location: str | None
+ requires: list[str]
+ required_by: list[str]
installer: str
metadata_version: str
- classifiers: List[str]
+ classifiers: list[str]
summary: str
homepage: str
- project_urls: List[str]
+ project_urls: list[str]
author: str
author_email: str
license: str
license_expression: str
- entry_points: List[str]
- files: Optional[List[str]]
+ entry_points: list[str]
+ files: list[str] | None
-def search_packages_info(query: List[str]) -> Generator[_PackageInfo, None, None]:
+def search_packages_info(query: list[str]) -> Generator[_PackageInfo, None, None]:
"""
Gather details from installed distributions. Print distribution name,
version, location, and installed files. Installed files requires a
@@ -124,7 +135,7 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
files_iter = dist.iter_declared_entries()
if files_iter is None:
- files: Optional[List[str]] = None
+ files: list[str] | None = None
else:
files = sorted(files_iter)
@@ -135,13 +146,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/addons/source-python/packages/site-packages/pip/_internal/commands/uninstall.py b/addons/source-python/packages/site-packages/pip/_internal/commands/uninstall.py
index bc0edeac9..9c4f031f9 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/uninstall.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/uninstall.py
@@ -1,6 +1,5 @@
import logging
from optparse import Values
-from typing import List
from pip._vendor.packaging.utils import canonicalize_name
@@ -62,7 +61,7 @@ def add_options(self) -> None:
self.cmd_opts.add_option(cmdoptions.override_externally_managed())
self.parser.insert_option_group(0, self.cmd_opts)
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
session = self.get_default_session(options)
reqs_to_uninstall = {}
diff --git a/addons/source-python/packages/site-packages/pip/_internal/commands/wheel.py b/addons/source-python/packages/site-packages/pip/_internal/commands/wheel.py
index 278719f4e..a85743343 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/commands/wheel.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/commands/wheel.py
@@ -2,7 +2,6 @@
import os
import shutil
from optparse import Values
-from typing import List
from pip._internal.cache import WheelCache
from pip._internal.cli import cmdoptions
@@ -12,11 +11,10 @@
from pip._internal.operations.build.build_tracker import get_build_tracker
from pip._internal.req.req_install import (
InstallRequirement,
- check_legacy_setup_py_options,
)
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__)
@@ -53,16 +51,14 @@ def add_options(self) -> None:
"current working directory."
),
)
- 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.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.constraints())
+ self.cmd_opts.add_option(cmdoptions.build_constraints())
self.cmd_opts.add_option(cmdoptions.editable())
self.cmd_opts.add_option(cmdoptions.requirements())
+ self.cmd_opts.add_option(cmdoptions.requirements_from_scripts())
self.cmd_opts.add_option(cmdoptions.src())
self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
self.cmd_opts.add_option(cmdoptions.no_deps())
@@ -77,18 +73,6 @@ def add_options(self) -> None:
)
self.cmd_opts.add_option(cmdoptions.config_settings())
- self.cmd_opts.add_option(cmdoptions.build_options())
- self.cmd_opts.add_option(cmdoptions.global_options())
-
- self.cmd_opts.add_option(
- "--pre",
- action="store_true",
- default=False,
- help=(
- "Include pre-release and development versions. By default, "
- "pip only finds stable versions."
- ),
- )
self.cmd_opts.add_option(cmdoptions.require_hashes())
@@ -97,11 +81,20 @@ def add_options(self) -> None:
self.parser,
)
+ selection_opts = cmdoptions.make_option_group(
+ cmdoptions.package_selection_group,
+ self.parser,
+ )
+
self.parser.insert_option_group(0, index_opts)
+ self.parser.insert_option_group(0, selection_opts)
self.parser.insert_option_group(0, self.cmd_opts)
@with_cleanup
- def run(self, options: Values, args: List[str]) -> int:
+ def run(self, options: Values, args: list[str]) -> int:
+ cmdoptions.check_build_constraints(options)
+ cmdoptions.check_release_control_exclusive(options)
+
session = self.get_default_session(options)
finder = self._build_package_finder(options, session)
@@ -118,7 +111,6 @@ def run(self, options: Values, args: List[str]) -> int:
)
reqs = self.get_requirements(args, options, finder, session)
- check_legacy_setup_py_options(options, reqs)
wheel_cache = WheelCache(options.cache_dir)
@@ -139,29 +131,26 @@ def run(self, options: Values, args: List[str]) -> int:
options=options,
wheel_cache=wheel_cache,
ignore_requires_python=options.ignore_requires_python,
- use_pep517=options.use_pep517,
)
self.trace_basic_info(finder)
requirement_set = resolver.resolve(reqs, check_supported_wheels=True)
- reqs_to_build: List[InstallRequirement] = []
+ preparer.prepare_linked_requirements_more(requirement_set.requirements.values())
+
+ reqs_to_build: list[InstallRequirement] = []
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())
-
# build wheels
build_successes, build_failures = build(
reqs_to_build,
wheel_cache=wheel_cache,
verify=(not options.no_verify),
- build_options=options.build_options or [],
- global_options=options.global_options or [],
)
for req in build_successes:
assert req.link and req.link.is_wheel
diff --git a/addons/source-python/packages/site-packages/pip/_internal/configuration.py b/addons/source-python/packages/site-packages/pip/_internal/configuration.py
index ffeda1d47..e164653bb 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/configuration.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/configuration.py
@@ -11,11 +11,14 @@
A single word describing where the configuration key-value pair came from
"""
+from __future__ import annotations
+
import configparser
import locale
import os
import sys
-from typing import Any, Dict, Iterable, List, NewType, Optional, Tuple
+from collections.abc import Iterable
+from typing import Any, NewType
from pip._internal.exceptions import (
ConfigurationError,
@@ -50,12 +53,11 @@
def _normalize_name(name: str) -> str:
"""Make a name consistent regardless of source (environment or file)"""
name = name.lower().replace("_", "-")
- if name.startswith("--"):
- name = name[2:] # only prefer long opts
+ name = name.removeprefix("--") # only prefer long opts
return name
-def _disassemble_key(name: str) -> List[str]:
+def _disassemble_key(name: str) -> list[str]:
if "." not in name:
error_message = (
"Key does not contain dot separated section and key. "
@@ -65,7 +67,7 @@ def _disassemble_key(name: str) -> List[str]:
return name.split(".", 1)
-def get_configuration_files() -> Dict[Kind, List[str]]:
+def get_configuration_files() -> dict[Kind, list[str]]:
global_config_files = [
os.path.join(path, CONFIG_BASENAME) for path in appdirs.site_config_dirs("pip")
]
@@ -98,7 +100,7 @@ class Configuration:
and the data stored is also nice.
"""
- def __init__(self, isolated: bool, load_only: Optional[Kind] = None) -> None:
+ def __init__(self, isolated: bool, load_only: Kind | None = None) -> None:
super().__init__()
if load_only is not None and load_only not in VALID_LOAD_ONLY:
@@ -111,13 +113,13 @@ def __init__(self, isolated: bool, load_only: Optional[Kind] = None) -> None:
self.load_only = load_only
# Because we keep track of where we got the data from
- self._parsers: Dict[Kind, List[Tuple[str, RawConfigParser]]] = {
+ self._parsers: dict[Kind, list[tuple[str, RawConfigParser]]] = {
variant: [] for variant in OVERRIDE_ORDER
}
- self._config: Dict[Kind, Dict[str, Any]] = {
+ self._config: dict[Kind, dict[str, dict[str, Any]]] = {
variant: {} for variant in OVERRIDE_ORDER
}
- self._modified_parsers: List[Tuple[str, RawConfigParser]] = []
+ self._modified_parsers: list[tuple[str, RawConfigParser]] = []
def load(self) -> None:
"""Loads configuration from configuration files and environment"""
@@ -125,7 +127,7 @@ def load(self) -> None:
if not self.isolated:
self._load_environment_vars()
- def get_file_to_edit(self) -> Optional[str]:
+ def get_file_to_edit(self) -> str | None:
"""Returns the file with highest priority in configuration"""
assert self.load_only is not None, "Need to be specified a file to be editing"
@@ -134,7 +136,7 @@ def get_file_to_edit(self) -> Optional[str]:
except IndexError:
return None
- def items(self) -> Iterable[Tuple[str, Any]]:
+ def items(self) -> Iterable[tuple[str, Any]]:
"""Returns key-value pairs like dict.items() representing the loaded
configuration
"""
@@ -145,7 +147,10 @@ def get_value(self, key: str) -> Any:
orig_key = key
key = _normalize_name(key)
try:
- return self._dictionary[key]
+ clean_config: dict[str, Any] = {}
+ for file_values in self._dictionary.values():
+ clean_config.update(file_values)
+ return clean_config[key]
except KeyError:
# disassembling triggers a more useful error message than simply
# "No such key" in the case that the key isn't in the form command.option
@@ -168,7 +173,8 @@ def set_value(self, key: str, value: Any) -> None:
parser.add_section(section)
parser.set(section, name, value)
- self._config[self.load_only][key] = value
+ self._config[self.load_only].setdefault(fname, {})
+ self._config[self.load_only][fname][key] = value
self._mark_as_modified(fname, parser)
def unset_value(self, key: str) -> None:
@@ -178,11 +184,14 @@ def unset_value(self, key: str) -> None:
self._ensure_have_load_only()
assert self.load_only
- if key not in self._config[self.load_only]:
- raise ConfigurationError(f"No such key - {orig_key}")
-
fname, parser = self._get_parser_to_modify()
+ if (
+ key not in self._config[self.load_only][fname]
+ and key not in self._config[self.load_only]
+ ):
+ raise ConfigurationError(f"No such key - {orig_key}")
+
if parser is not None:
section, name = _disassemble_key(key)
if not (
@@ -197,8 +206,10 @@ def unset_value(self, key: str) -> None:
if not parser.items(section):
parser.remove_section(section)
self._mark_as_modified(fname, parser)
-
- del self._config[self.load_only][key]
+ try:
+ del self._config[self.load_only][fname][key]
+ except KeyError:
+ del self._config[self.load_only][key]
def save(self) -> None:
"""Save the current in-memory state."""
@@ -230,7 +241,7 @@ def _ensure_have_load_only(self) -> None:
logger.debug("Will be working with %s variant only", self.load_only)
@property
- def _dictionary(self) -> Dict[str, Any]:
+ def _dictionary(self) -> dict[str, dict[str, Any]]:
"""A dictionary representing the loaded configuration."""
# NOTE: Dictionaries are not populated if not loaded. So, conditionals
# are not needed here.
@@ -270,7 +281,8 @@ def _load_file(self, variant: Kind, fname: str) -> RawConfigParser:
for section in parser.sections():
items = parser.items(section)
- self._config[variant].update(self._normalized_keys(section, items))
+ self._config[variant].setdefault(fname, {})
+ self._config[variant][fname].update(self._normalized_keys(section, items))
return parser
@@ -297,13 +309,14 @@ def _construct_parser(self, fname: str) -> RawConfigParser:
def _load_environment_vars(self) -> None:
"""Loads configuration from environment variables"""
- self._config[kinds.ENV_VAR].update(
+ self._config[kinds.ENV_VAR].setdefault(":env:", {})
+ self._config[kinds.ENV_VAR][":env:"].update(
self._normalized_keys(":env:", self.get_environ_vars())
)
def _normalized_keys(
- self, section: str, items: Iterable[Tuple[str, Any]]
- ) -> Dict[str, Any]:
+ self, section: str, items: Iterable[tuple[str, Any]]
+ ) -> dict[str, Any]:
"""Normalizes items to construct a dictionary with normalized keys.
This routine is where the names become keys and are made the same
@@ -315,7 +328,7 @@ def _normalized_keys(
normalized[key] = val
return normalized
- def get_environ_vars(self) -> Iterable[Tuple[str, str]]:
+ def get_environ_vars(self) -> Iterable[tuple[str, str]]:
"""Returns a generator with all environmental vars with prefix PIP_"""
for key, val in os.environ.items():
if key.startswith("PIP_"):
@@ -324,7 +337,7 @@ def get_environ_vars(self) -> Iterable[Tuple[str, str]]:
yield name, val
# XXX: This is patched in the tests.
- def iter_config_files(self) -> Iterable[Tuple[Kind, List[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. The order
@@ -356,11 +369,11 @@ def iter_config_files(self) -> Iterable[Tuple[Kind, List[str]]]:
else:
yield kinds.ENV, []
- def get_values_in_config(self, variant: Kind) -> Dict[str, Any]:
+ def get_values_in_config(self, variant: Kind) -> dict[str, Any]:
"""Get values present in a config file"""
return self._config[variant]
- def _get_parser_to_modify(self) -> Tuple[str, RawConfigParser]:
+ def _get_parser_to_modify(self) -> tuple[str, RawConfigParser]:
# Determine which parser to modify
assert self.load_only
parsers = self._parsers[self.load_only]
diff --git a/addons/source-python/packages/site-packages/pip/_internal/distributions/base.py b/addons/source-python/packages/site-packages/pip/_internal/distributions/base.py
index 6e4d0c91a..ea61f3501 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/distributions/base.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/distributions/base.py
@@ -1,11 +1,13 @@
+from __future__ import annotations
+
import abc
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
from pip._internal.metadata.base import BaseDistribution
from pip._internal.req import InstallRequirement
if TYPE_CHECKING:
- from pip._internal.index.package_finder import PackageFinder
+ from pip._internal.build_env import BuildEnvironmentInstaller
class AbstractDistribution(metaclass=abc.ABCMeta):
@@ -32,7 +34,7 @@ def __init__(self, req: InstallRequirement) -> None:
self.req = req
@abc.abstractproperty
- def build_tracker_id(self) -> Optional[str]:
+ def build_tracker_id(self) -> str | None:
"""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
@@ -46,7 +48,7 @@ def get_metadata_distribution(self) -> BaseDistribution:
@abc.abstractmethod
def prepare_distribution_metadata(
self,
- finder: "PackageFinder",
+ build_env_installer: BuildEnvironmentInstaller,
build_isolation: bool,
check_build_deps: bool,
) -> None:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/distributions/installed.py b/addons/source-python/packages/site-packages/pip/_internal/distributions/installed.py
index ab8d53be7..b6a67df24 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/distributions/installed.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/distributions/installed.py
@@ -1,9 +1,13 @@
-from typing import Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
from pip._internal.distributions.base import AbstractDistribution
-from pip._internal.index.package_finder import PackageFinder
from pip._internal.metadata import BaseDistribution
+if TYPE_CHECKING:
+ from pip._internal.build_env import BuildEnvironmentInstaller
+
class InstalledDistribution(AbstractDistribution):
"""Represents an installed package.
@@ -13,7 +17,7 @@ class InstalledDistribution(AbstractDistribution):
"""
@property
- def build_tracker_id(self) -> Optional[str]:
+ def build_tracker_id(self) -> str | None:
return None
def get_metadata_distribution(self) -> BaseDistribution:
@@ -22,7 +26,7 @@ def get_metadata_distribution(self) -> BaseDistribution:
def prepare_distribution_metadata(
self,
- finder: PackageFinder,
+ build_env_installer: BuildEnvironmentInstaller,
build_isolation: bool,
check_build_deps: bool,
) -> None:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/distributions/sdist.py b/addons/source-python/packages/site-packages/pip/_internal/distributions/sdist.py
index 28ea5cea1..f7bd7836d 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/distributions/sdist.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/distributions/sdist.py
@@ -1,5 +1,8 @@
+from __future__ import annotations
+
import logging
-from typing import TYPE_CHECKING, Iterable, Optional, Set, Tuple
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
from pip._internal.build_env import BuildEnvironment
from pip._internal.distributions.base import AbstractDistribution
@@ -8,7 +11,7 @@
from pip._internal.utils.subprocess import runner_with_spinner_message
if TYPE_CHECKING:
- from pip._internal.index.package_finder import PackageFinder
+ from pip._internal.build_env import BuildEnvironmentInstaller
logger = logging.getLogger(__name__)
@@ -17,11 +20,11 @@ class SourceDistribution(AbstractDistribution):
"""Represents a source distribution.
The preparation step for these needs metadata for the packages to be
- generated, either using PEP 517 or using the legacy `setup.py egg_info`.
+ generated.
"""
@property
- def build_tracker_id(self) -> Optional[str]:
+ def build_tracker_id(self) -> str | None:
"""Identify this requirement uniquely by its link."""
assert self.req.link
return self.req.link.url_without_fragment
@@ -31,32 +34,31 @@ def get_metadata_distribution(self) -> BaseDistribution:
def prepare_distribution_metadata(
self,
- finder: "PackageFinder",
+ build_env_installer: BuildEnvironmentInstaller,
build_isolation: bool,
check_build_deps: bool,
) -> None:
- # Load pyproject.toml, to determine whether PEP 517 is to be used
+ # Load pyproject.toml
self.req.load_pyproject_toml()
# Set up the build isolation, if this requirement should be isolated
- should_isolate = self.req.use_pep517 and build_isolation
- if should_isolate:
+ if build_isolation:
# Setup an isolated environment and install the build backend static
# requirements in it.
- self._prepare_build_backend(finder)
- # Check that if the requirement is editable, it either supports PEP 660 or
- # has a setup.py or a setup.cfg. This cannot be done earlier because we need
- # to setup the build backend to verify it supports build_editable, nor can
- # it be done later, because we want to avoid installing build requirements
- # needlessly. Doing it here also works around setuptools generating
- # UNKNOWN.egg-info when running get_requires_for_build_wheel on a directory
- # without setup.py nor setup.cfg.
- self.req.isolated_editable_sanity_check()
+ self._prepare_build_backend(build_env_installer)
+ # Check that the build backend supports PEP 660. This cannot be done
+ # earlier because we need to setup the build backend to verify it
+ # supports build_editable, nor can it be done later, because we want
+ # to avoid installing build requirements needlessly.
+ self.req.editable_sanity_check()
# Install the dynamic build requirements.
- self._install_build_reqs(finder)
+ self._install_build_reqs(build_env_installer)
+ else:
+ # When not using build isolation, we still need to check that
+ # the build backend supports PEP 660.
+ self.req.editable_sanity_check()
# Check if the current environment provides build dependencies
- should_check_deps = self.req.use_pep517 and check_build_deps
- if should_check_deps:
+ if check_build_deps:
pyproject_requires = self.req.pyproject_requires
assert pyproject_requires is not None
conflicting, missing = self.req.build_env.check_requirements(
@@ -68,15 +70,17 @@ 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, build_env_installer: BuildEnvironmentInstaller
+ ) -> None:
# Isolate in a BuildEnvironment and install the build-time
# requirements.
pyproject_requires = self.req.pyproject_requires
assert pyproject_requires is not None
- self.req.build_env = BuildEnvironment()
+ self.req.build_env = BuildEnvironment(build_env_installer)
self.req.build_env.install_requirements(
- finder, pyproject_requires, "overlay", kind="build dependencies"
+ pyproject_requires, "overlay", kind="build dependencies", for_req=self.req
)
conflicting, missing = self.req.build_env.check_requirements(
self.req.requirements_to_check
@@ -112,7 +116,9 @@ 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, build_env_installer: BuildEnvironmentInstaller
+ ) -> 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.
@@ -128,11 +134,11 @@ def _install_build_reqs(self, finder: "PackageFinder") -> None:
if conflicting:
self._raise_conflicts("the backend dependencies", conflicting)
self.req.build_env.install_requirements(
- finder, missing, "normal", kind="backend dependencies"
+ missing, "normal", kind="backend dependencies", for_req=self.req
)
def _raise_conflicts(
- self, conflicting_with: str, conflicting_reqs: Set[Tuple[str, str]]
+ self, conflicting_with: str, conflicting_reqs: set[tuple[str, str]]
) -> None:
format_string = (
"Some build dependencies for {requirement} "
@@ -148,7 +154,7 @@ def _raise_conflicts(
)
raise InstallationError(error_message)
- def _raise_missing_reqs(self, missing: Set[str]) -> None:
+ def _raise_missing_reqs(self, missing: set[str]) -> None:
format_string = (
"Some build dependencies for {requirement} are missing: {missing}."
)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/distributions/wheel.py b/addons/source-python/packages/site-packages/pip/_internal/distributions/wheel.py
index bfadd39dc..ee12bfadc 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/distributions/wheel.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/distributions/wheel.py
@@ -1,4 +1,6 @@
-from typing import TYPE_CHECKING, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
from pip._vendor.packaging.utils import canonicalize_name
@@ -10,7 +12,7 @@
)
if TYPE_CHECKING:
- from pip._internal.index.package_finder import PackageFinder
+ from pip._internal.build_env import BuildEnvironmentInstaller
class WheelDistribution(AbstractDistribution):
@@ -20,7 +22,7 @@ class WheelDistribution(AbstractDistribution):
"""
@property
- def build_tracker_id(self) -> Optional[str]:
+ def build_tracker_id(self) -> str | None:
return None
def get_metadata_distribution(self) -> BaseDistribution:
@@ -35,7 +37,7 @@ def get_metadata_distribution(self) -> BaseDistribution:
def prepare_distribution_metadata(
self,
- finder: "PackageFinder",
+ build_env_installer: BuildEnvironmentInstaller,
build_isolation: bool,
check_build_deps: bool,
) -> None:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/exceptions.py b/addons/source-python/packages/site-packages/pip/_internal/exceptions.py
index 45a876a85..9ddda0e62 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/exceptions.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/exceptions.py
@@ -5,6 +5,8 @@
subpackage and, thus, should not depend on them.
"""
+from __future__ import annotations
+
import configparser
import contextlib
import locale
@@ -12,8 +14,10 @@
import pathlib
import re
import sys
+import traceback
+from collections.abc import Iterable, Iterator
from itertools import chain, groupby, repeat
-from typing import TYPE_CHECKING, Dict, Iterator, List, Literal, Optional, Union
+from typing import TYPE_CHECKING, Literal
from pip._vendor.packaging.requirements import InvalidRequirement
from pip._vendor.packaging.version import InvalidVersion
@@ -24,9 +28,11 @@
if TYPE_CHECKING:
from hashlib import _Hash
- from pip._vendor.requests.models import Request, Response
+ from pip._vendor.requests.models import PreparedRequest, Request, Response
from pip._internal.metadata import BaseDistribution
+ from pip._internal.models.link import Link
+ from pip._internal.network.download import _FileDownload
from pip._internal.req.req_install import InstallRequirement
logger = logging.getLogger(__name__)
@@ -40,7 +46,7 @@ def _is_kebab_case(s: str) -> bool:
def _prefix_with_indent(
- s: Union[Text, str],
+ s: Text | str,
console: Console,
*,
prefix: str,
@@ -76,13 +82,13 @@ class DiagnosticPipError(PipError):
def __init__(
self,
*,
- kind: 'Literal["error", "warning"]' = "error",
- reference: Optional[str] = None,
- message: Union[str, Text],
- context: Optional[Union[str, Text]],
- hint_stmt: Optional[Union[str, Text]],
- note_stmt: Optional[Union[str, Text]] = None,
- link: Optional[str] = None,
+ kind: Literal["error", "warning"] = "error",
+ reference: str | None = None,
+ message: str | Text,
+ context: str | Text | None,
+ hint_stmt: str | Text | None,
+ note_stmt: str | Text | None = None,
+ link: str | None = None,
) -> None:
# Ensure a proper reference is provided.
if reference is None:
@@ -186,6 +192,23 @@ class InstallationError(PipError):
"""General exception during installation"""
+class FailedToPrepareCandidate(InstallationError):
+ """Raised when we fail to prepare a candidate (i.e. fetch and generate metadata).
+
+ This is intentionally not a diagnostic error, since the output will be presented
+ above this error, when this occurs. This should instead present information to the
+ user.
+ """
+
+ def __init__(
+ self, *, package_name: str, requirement_chain: str, failed_step: str
+ ) -> None:
+ super().__init__(f"Failed to build '{package_name}' when {failed_step.lower()}")
+ self.package_name = package_name
+ self.requirement_chain = requirement_chain
+ self.failed_step = failed_step
+
+
class MissingPyProjectBuildRequires(DiagnosticPipError):
"""Raised when pyproject.toml has `build-system`, but no `build-system.requires`."""
@@ -231,7 +254,7 @@ class NoneMetadataError(PipError):
def __init__(
self,
- dist: "BaseDistribution",
+ dist: BaseDistribution,
metadata_name: str,
) -> None:
"""
@@ -292,8 +315,8 @@ class NetworkConnectionError(PipError):
def __init__(
self,
error_msg: str,
- response: Optional["Response"] = None,
- request: Optional["Request"] = None,
+ response: Response | None = None,
+ request: Request | PreparedRequest | None = None,
) -> None:
"""
Initialize NetworkConnectionError with `request` and `response`
@@ -342,7 +365,7 @@ class MetadataInconsistent(InstallationError):
"""
def __init__(
- self, ireq: "InstallRequirement", field: str, f_val: str, m_val: str
+ self, ireq: InstallRequirement, field: str, f_val: str, m_val: str
) -> None:
self.ireq = ireq
self.field = field
@@ -359,7 +382,7 @@ def __str__(self) -> str:
class MetadataInvalid(InstallationError):
"""Metadata is invalid."""
- def __init__(self, ireq: "InstallRequirement", error: str) -> None:
+ def __init__(self, ireq: InstallRequirement, error: str) -> None:
self.ireq = ireq
self.error = error
@@ -377,10 +400,10 @@ def __init__(
*,
command_description: str,
exit_code: int,
- output_lines: Optional[List[str]],
+ output_lines: list[str] | None,
) -> None:
if output_lines is None:
- output_prompt = Text("See above for output.")
+ output_prompt = Text("No available output.")
else:
output_prompt = (
Text.from_markup(f"[red][{len(output_lines)} lines of output][/]\n")
@@ -408,7 +431,7 @@ def __str__(self) -> str:
return f"{self.command_description} exited with {self.exit_code}"
-class MetadataGenerationFailed(InstallationSubprocessError, InstallationError):
+class MetadataGenerationFailed(DiagnosticPipError, InstallationError):
reference = "metadata-generation-failed"
def __init__(
@@ -416,7 +439,7 @@ def __init__(
*,
package_details: str,
) -> None:
- super(InstallationSubprocessError, self).__init__(
+ super().__init__(
message="Encountered error while generating package metadata.",
context=escape(package_details),
hint_stmt="See above for details.",
@@ -431,9 +454,9 @@ 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:
+ def append(self, error: HashError) -> None:
self.errors.append(error)
def __str__(self) -> str:
@@ -467,7 +490,7 @@ class HashError(InstallationError):
"""
- req: Optional["InstallRequirement"] = None
+ req: InstallRequirement | None = None
head = ""
order: int = -1
@@ -589,7 +612,7 @@ class HashMismatch(HashError):
"someone may have tampered with them."
)
- def __init__(self, allowed: Dict[str, List[str]], gots: Dict[str, "_Hash"]) -> None:
+ def __init__(self, allowed: dict[str, list[str]], gots: dict[str, _Hash]) -> None:
"""
:param allowed: A dict of algorithm names pointing to lists of allowed
hex digests
@@ -614,12 +637,12 @@ def _hash_comparison(self) -> str:
"""
- def hash_then_or(hash_name: str) -> "chain[str]":
+ def hash_then_or(hash_name: str) -> chain[str]:
# For now, all the decent hashes have 6-char names, so we can get
# away with hard-coding space literals.
return chain([hash_name], repeat(" or"))
- lines: List[str] = []
+ lines: list[str] = []
for hash_name, expecteds in self.allowed.items():
prefix = hash_then_or(hash_name)
lines.extend((f" Expected {next(prefix)} {e}") for e in expecteds)
@@ -640,8 +663,8 @@ class ConfigurationFileCouldNotBeLoaded(ConfigurationError):
def __init__(
self,
reason: str = "could not be loaded",
- fname: Optional[str] = None,
- error: Optional[configparser.Error] = None,
+ fname: str | None = None,
+ error: configparser.Error | None = None,
) -> None:
super().__init__(error)
self.reason = reason
@@ -676,7 +699,7 @@ class ExternallyManagedEnvironment(DiagnosticPipError):
reference = "externally-managed-environment"
- def __init__(self, error: Optional[str]) -> None:
+ def __init__(self, error: str | None) -> None:
if error is None:
context = Text(_DEFAULT_EXTERNALLY_MANAGED_ERROR)
else:
@@ -703,7 +726,7 @@ def _iter_externally_managed_error_keys() -> Iterator[str]:
try:
category = locale.LC_MESSAGES
except AttributeError:
- lang: Optional[str] = None
+ lang: str | None = None
else:
lang, _ = locale.getlocale(category)
if lang is not None:
@@ -718,8 +741,8 @@ def _iter_externally_managed_error_keys() -> Iterator[str]:
@classmethod
def from_config(
cls,
- config: Union[pathlib.Path, str],
- ) -> "ExternallyManagedEnvironment":
+ config: pathlib.Path | str,
+ ) -> ExternallyManagedEnvironment:
parser = configparser.ConfigParser(interpolation=None)
try:
parser.read(config, encoding="utf-8")
@@ -740,7 +763,7 @@ def from_config(
class UninstallMissingRecord(DiagnosticPipError):
reference = "uninstall-no-record-file"
- def __init__(self, *, distribution: "BaseDistribution") -> None:
+ def __init__(self, *, distribution: BaseDistribution) -> None:
installer = distribution.installer
if not installer or installer == "pip":
dep = f"{distribution.raw_name}=={distribution.version}"
@@ -767,7 +790,7 @@ def __init__(self, *, distribution: "BaseDistribution") -> None:
class LegacyDistutilsInstall(DiagnosticPipError):
reference = "uninstall-distutils-installed-package"
- def __init__(self, *, distribution: "BaseDistribution") -> None:
+ def __init__(self, *, distribution: BaseDistribution) -> None:
super().__init__(
message=Text(f"Cannot uninstall {distribution}"),
context=(
@@ -785,8 +808,8 @@ class InvalidInstalledPackage(DiagnosticPipError):
def __init__(
self,
*,
- dist: "BaseDistribution",
- invalid_exc: Union[InvalidRequirement, InvalidVersion],
+ dist: BaseDistribution,
+ invalid_exc: InvalidRequirement | InvalidVersion,
) -> None:
installed_location = dist.installed_location
@@ -807,3 +830,142 @@ def __init__(
),
hint_stmt="To proceed this package must be uninstalled.",
)
+
+
+class IncompleteDownloadError(DiagnosticPipError):
+ """Raised when the downloader receives fewer bytes than advertised
+ in the Content-Length header."""
+
+ reference = "incomplete-download"
+
+ def __init__(self, download: _FileDownload) -> None:
+ # Dodge circular import.
+ from pip._internal.utils.misc import format_size
+
+ assert download.size is not None
+ download_status = (
+ f"{format_size(download.bytes_received)}/{format_size(download.size)}"
+ )
+ if download.reattempts:
+ retry_status = f"after {download.reattempts + 1} attempts "
+ hint = "Use --resume-retries to configure resume attempt limit."
+ else:
+ # Download retrying is not enabled.
+ 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: {download.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."""
+
+ 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",
+ )
+
+
+class InstallWheelBuildError(DiagnosticPipError):
+ reference = "failed-wheel-build-for-install"
+
+ def __init__(self, failed: list[InstallRequirement]) -> None:
+ super().__init__(
+ message=(
+ "Failed to build installable wheels for some "
+ "pyproject.toml based projects"
+ ),
+ context=", ".join(r.name for r in failed), # type: ignore
+ hint_stmt=None,
+ )
+
+
+class InvalidEggFragment(DiagnosticPipError):
+ reference = "invalid-egg-fragment"
+
+ def __init__(self, link: Link, fragment: str) -> None:
+ hint = ""
+ if ">" in fragment or "=" in fragment or "<" in fragment:
+ hint = (
+ "Version specifiers are silently ignored for URL references. "
+ "Remove them. "
+ )
+ if "[" in fragment and "]" in fragment:
+ hint += "Try using the Direct URL requirement syntax: 'name[extra] @ URL'"
+
+ if not hint:
+ hint = "Egg fragments can only be a valid project name."
+
+ super().__init__(
+ message=f"The '{escape(fragment)}' egg fragment is invalid",
+ context=f"from '{escape(str(link))}'",
+ hint_stmt=escape(hint),
+ )
+
+
+class BuildDependencyInstallError(DiagnosticPipError):
+ """Raised when build dependencies cannot be installed."""
+
+ reference = "failed-build-dependency-install"
+
+ def __init__(
+ self,
+ req: InstallRequirement | None,
+ build_reqs: Iterable[str],
+ *,
+ cause: Exception,
+ log_lines: list[str] | None,
+ ) -> None:
+ if isinstance(cause, PipError):
+ note = "This is likely not a problem with pip."
+ else:
+ note = (
+ "pip crashed unexpectedly. Please file an issue on pip's issue "
+ "tracker: https://github.com/pypa/pip/issues/new"
+ )
+
+ if log_lines is None:
+ # No logs are available, they must have been printed earlier.
+ context = Text("See above for more details.")
+ else:
+ if isinstance(cause, PipError):
+ log_lines.append(f"ERROR: {cause}")
+ else:
+ # Split rendered error into real lines without trailing newlines.
+ log_lines.extend(
+ "".join(traceback.format_exception(cause)).splitlines()
+ )
+
+ context = Text.assemble(
+ f"Installing {' '.join(build_reqs)}\n",
+ (f"[{len(log_lines)} lines of output]\n", "red"),
+ "\n".join(log_lines),
+ ("\n[end of output]", "red"),
+ )
+
+ message = Text("Cannot install build dependencies", "green")
+ if req:
+ message += Text(f" for {req}")
+ super().__init__(
+ message=message, context=context, hint_stmt=None, note_stmt=note
+ )
diff --git a/addons/source-python/packages/site-packages/pip/_internal/index/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/index/__init__.py
index 7a17b7b3b..197dd757d 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/index/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/index/__init__.py
@@ -1,2 +1 @@
-"""Index interaction code
-"""
+"""Index interaction code"""
diff --git a/addons/source-python/packages/site-packages/pip/_internal/index/collector.py b/addons/source-python/packages/site-packages/pip/_internal/index/collector.py
index 5f8fdee3d..a9a8dde8b 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/index/collector.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/index/collector.py
@@ -2,6 +2,8 @@
The main purpose of this module is to expose LinkCollector.collect_sources().
"""
+from __future__ import annotations
+
import collections
import email.message
import functools
@@ -10,22 +12,14 @@
import logging
import os
import urllib.parse
-import urllib.request
+from collections.abc import Iterable, MutableMapping, Sequence
from dataclasses import dataclass
from html.parser import HTMLParser
from optparse import Values
from typing import (
Callable,
- Dict,
- Iterable,
- List,
- MutableMapping,
NamedTuple,
- Optional,
Protocol,
- Sequence,
- Tuple,
- Union,
)
from pip._vendor import requests
@@ -39,6 +33,7 @@
from pip._internal.network.utils import raise_for_status
from pip._internal.utils.filetypes import is_archive_file
from pip._internal.utils.misc import redact_auth_from_url
+from pip._internal.utils.urls import url_to_path
from pip._internal.vcs import vcs
from .sources import CandidatesFromPage, LinkSource, build_source
@@ -48,7 +43,7 @@
ResponseHeaders = MutableMapping[str, str]
-def _match_vcs_scheme(url: str) -> Optional[str]:
+def _match_vcs_scheme(url: str) -> str | None:
"""Look for VCS schemes in the URL.
Returns the matched VCS scheme, or None if there's no match.
@@ -173,7 +168,7 @@ def _get_simple_response(url: str, session: PipSession) -> Response:
return resp
-def _get_encoding_from_headers(headers: ResponseHeaders) -> Optional[str]:
+def _get_encoding_from_headers(headers: ResponseHeaders) -> str | None:
"""Determine if we have any encoding information in our headers."""
if headers and "Content-Type" in headers:
m = email.message.Message()
@@ -185,7 +180,7 @@ def _get_encoding_from_headers(headers: ResponseHeaders) -> Optional[str]:
class CacheablePageContent:
- def __init__(self, page: "IndexContent") -> None:
+ def __init__(self, page: IndexContent) -> None:
assert page.cache_link_parsing
self.page = page
@@ -197,7 +192,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:
@@ -207,12 +202,12 @@ def with_cached_index_content(fn: ParseLinks) -> ParseLinks:
`page` has `page.cache_link_parsing == False`.
"""
- @functools.lru_cache(maxsize=None)
- def wrapper(cacheable_page: CacheablePageContent) -> List[Link]:
+ @functools.cache
+ def wrapper(cacheable_page: CacheablePageContent) -> list[Link]:
return list(fn(cacheable_page.page))
@functools.wraps(fn)
- def wrapper_wrapper(page: "IndexContent") -> List[Link]:
+ def wrapper_wrapper(page: IndexContent) -> list[Link]:
if page.cache_link_parsing:
return wrapper(CacheablePageContent(page))
return list(fn(page))
@@ -221,7 +216,7 @@ def wrapper_wrapper(page: "IndexContent") -> List[Link]:
@with_cached_index_content
-def parse_links(page: "IndexContent") -> Iterable[Link]:
+def parse_links(page: IndexContent) -> Iterable[Link]:
"""
Parse a Simple API's Index Content, and yield its anchor elements as Link objects.
"""
@@ -262,7 +257,7 @@ class IndexContent:
content: bytes
content_type: str
- encoding: Optional[str]
+ encoding: str | None
url: str
cache_link_parsing: bool = True
@@ -280,10 +275,10 @@ def __init__(self, url: str) -> None:
super().__init__(convert_charrefs=True)
self.url: str = url
- self.base_url: Optional[str] = None
- self.anchors: List[Dict[str, Optional[str]]] = []
+ self.base_url: str | None = None
+ self.anchors: list[dict[str, str | None]] = []
- def handle_starttag(self, tag: str, attrs: List[Tuple[str, Optional[str]]]) -> None:
+ def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None:
if tag == "base" and self.base_url is None:
href = self.get_href(attrs)
if href is not None:
@@ -291,7 +286,7 @@ def handle_starttag(self, tag: str, attrs: List[Tuple[str, Optional[str]]]) -> N
elif tag == "a":
self.anchors.append(dict(attrs))
- def get_href(self, attrs: List[Tuple[str, Optional[str]]]) -> Optional[str]:
+ def get_href(self, attrs: list[tuple[str, str | None]]) -> str | None:
for name, value in attrs:
if name == "href":
return value
@@ -300,8 +295,8 @@ def get_href(self, attrs: List[Tuple[str, Optional[str]]]) -> Optional[str]:
def _handle_get_simple_fail(
link: Link,
- reason: Union[str, Exception],
- meth: Optional[Callable[..., None]] = None,
+ reason: str | Exception,
+ meth: Callable[..., None] | None = None,
) -> None:
if meth is None:
meth = logger.debug
@@ -321,7 +316,7 @@ def _make_index_content(
)
-def _get_index_content(link: Link, *, session: PipSession) -> Optional["IndexContent"]:
+def _get_index_content(link: Link, *, session: PipSession) -> IndexContent | None:
url = link.url.split("#", 1)[0]
# Check for VCS schemes that do not support lookup as web pages.
@@ -335,8 +330,7 @@ def _get_index_content(link: Link, *, session: PipSession) -> Optional["IndexCon
return None
# Tack index.html onto file:// URLs that point to directories
- scheme, _, path, _, _, _ = urllib.parse.urlparse(url)
- if scheme == "file" and os.path.isdir(urllib.request.url2pathname(path)):
+ if url.startswith("file:") and os.path.isdir(url_to_path(url)):
# add trailing slash if not present so urljoin doesn't trim
# final segment
if not url.endswith("/"):
@@ -383,8 +377,8 @@ def _get_index_content(link: Link, *, session: PipSession) -> Optional["IndexCon
class CollectedSources(NamedTuple):
- find_links: Sequence[Optional[LinkSource]]
- index_urls: Sequence[Optional[LinkSource]]
+ find_links: Sequence[LinkSource | None]
+ index_urls: Sequence[LinkSource | None]
class LinkCollector:
@@ -409,7 +403,7 @@ def create(
session: PipSession,
options: Values,
suppress_no_index: bool = False,
- ) -> "LinkCollector":
+ ) -> LinkCollector:
"""
:param session: The Session to use to make requests.
:param suppress_no_index: Whether to ignore the --no-index option
@@ -438,10 +432,10 @@ def create(
return link_collector
@property
- def find_links(self) -> List[str]:
+ def find_links(self) -> list[str]:
return self.search_scope.find_links
- def fetch_response(self, location: Link) -> Optional[IndexContent]:
+ def fetch_response(self, location: Link) -> IndexContent | None:
"""
Fetch an HTML page containing package links.
"""
diff --git a/addons/source-python/packages/site-packages/pip/_internal/index/package_finder.py b/addons/source-python/packages/site-packages/pip/_internal/index/package_finder.py
index 85628ee5d..aa7c2ebd4 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/index/package_finder.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/index/package_finder.py
@@ -1,29 +1,40 @@
"""Routines related to PyPI, indexes"""
+from __future__ import annotations
+
+import datetime
import enum
import functools
import itertools
import logging
import re
+from collections.abc import Iterable
from dataclasses import dataclass
-from typing import TYPE_CHECKING, FrozenSet, Iterable, List, Optional, Set, Tuple, Union
+from typing import (
+ TYPE_CHECKING,
+ Optional,
+ Union,
+)
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 InvalidVersion, _BaseVersion
+from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
+from pip._vendor.packaging.version import InvalidVersion, Version, _BaseVersion
from pip._vendor.packaging.version import parse as parse_version
from pip._internal.exceptions import (
BestVersionAlreadyInstalled,
DistributionNotFound,
+ InstallationError,
InvalidWheelFilename,
UnsupportedWheel,
)
from pip._internal.index.collector import LinkCollector, parse_links
+from pip._internal.metadata import select_backend
from pip._internal.models.candidate import InstallationCandidate
from pip._internal.models.format_control import FormatControl
from pip._internal.models.link import Link
+from pip._internal.models.release_control import ReleaseControl
from pip._internal.models.search_scope import SearchScope
from pip._internal.models.selection_prefs import SelectionPreferences
from pip._internal.models.target_python import TargetPython
@@ -38,20 +49,20 @@
from pip._internal.utils.unpacking import SUPPORTED_EXTENSIONS
if TYPE_CHECKING:
- from pip._vendor.typing_extensions import TypeGuard
+ from typing_extensions import TypeGuard
__all__ = ["FormatControl", "BestCandidateResult", "PackageFinder"]
logger = getLogger(__name__)
-BuildTag = Union[Tuple[()], Tuple[int, str]]
-CandidateSortingKey = Tuple[int, int, int, _BaseVersion, Optional[int], BuildTag]
+BuildTag = Union[tuple[()], tuple[int, str]]
+CandidateSortingKey = tuple[int, int, int, _BaseVersion, Optional[int], BuildTag]
def _check_link_requires_python(
link: Link,
- version_info: Tuple[int, int, int],
+ version_info: tuple[int, int, int],
ignore_requires_python: bool = False,
) -> bool:
"""
@@ -104,6 +115,8 @@ class LinkType(enum.Enum):
format_invalid = enum.auto()
platform_mismatch = enum.auto()
requires_python_mismatch = enum.auto()
+ upload_too_late = enum.auto()
+ upload_time_missing = enum.auto()
class LinkEvaluator:
@@ -120,11 +133,12 @@ class LinkEvaluator:
def __init__(
self,
project_name: str,
- canonical_name: str,
- formats: FrozenSet[str],
+ canonical_name: NormalizedName,
+ formats: frozenset[str],
target_python: TargetPython,
allow_yanked: bool,
- ignore_requires_python: Optional[bool] = None,
+ ignore_requires_python: bool | None = None,
+ uploaded_prior_to: datetime.datetime | None = None,
) -> None:
"""
:param project_name: The user supplied package name.
@@ -142,6 +156,8 @@ def __init__(
:param ignore_requires_python: Whether to ignore incompatible
PEP 503 "data-requires-python" values in HTML links. Defaults
to False.
+ :param uploaded_prior_to: If set, only allow links uploaded prior to
+ the given datetime.
"""
if ignore_requires_python is None:
ignore_requires_python = False
@@ -151,10 +167,11 @@ def __init__(
self._ignore_requires_python = ignore_requires_python
self._formats = formats
self._target_python = target_python
+ self._uploaded_prior_to = uploaded_prior_to
self.project_name = project_name
- def evaluate_link(self, link: Link) -> Tuple[LinkType, str]:
+ def evaluate_link(self, link: Link) -> tuple[LinkType, str]:
"""
Determine whether a link is a candidate for installation.
@@ -194,7 +211,7 @@ def evaluate_link(self, link: Link) -> Tuple[LinkType, str]:
LinkType.format_invalid,
"invalid wheel filename",
)
- if canonicalize_name(wheel.name) != self._canonical_name:
+ if wheel.name != self._canonical_name:
reason = f"wrong project name (not {self.project_name})"
return (LinkType.different_project, reason)
@@ -211,6 +228,27 @@ def evaluate_link(self, link: Link) -> Tuple[LinkType, str]:
version = wheel.version
+ # Check upload-time filter after verifying the link is a package file.
+ # Skip this check for local files, as --uploaded-prior-to only applies
+ # to packages from indexes.
+ if self._uploaded_prior_to is not None and not link.is_file:
+ if link.upload_time is None:
+ if link.comes_from:
+ index_info = f"Index {link.comes_from}"
+ else:
+ index_info = "Index"
+
+ return (
+ LinkType.upload_time_missing,
+ f"{index_info} does not provide upload-time metadata.",
+ )
+ elif link.upload_time >= self._uploaded_prior_to:
+ return (
+ LinkType.upload_too_late,
+ f"Upload time {link.upload_time} not "
+ f"prior to {self._uploaded_prior_to}",
+ )
+
# This should be up by the self.ok_binary check, but see issue 2700.
if "source" not in self._formats and ext != WHEEL_EXTENSION:
reason = f"No sources permitted for {self.project_name}"
@@ -241,7 +279,19 @@ def evaluate_link(self, link: Link) -> Tuple[LinkType, str]:
ignore_requires_python=self._ignore_requires_python,
)
if not supports_python:
- reason = f"{version} Requires-Python {link.requires_python}"
+ requires_python = link.requires_python
+ if requires_python:
+
+ def get_version_sort_key(v: str) -> tuple[int, ...]:
+ return tuple(int(s) for s in v.split(".") if s.isdigit())
+
+ requires_python = ",".join(
+ sorted(
+ (str(s) for s in specifiers.SpecifierSet(requires_python)),
+ key=get_version_sort_key,
+ )
+ )
+ reason = f"{version} Requires-Python {requires_python}"
return (LinkType.requires_python_mismatch, reason)
logger.debug("Found link %s, version: %s", link, version)
@@ -250,10 +300,10 @@ def evaluate_link(self, link: Link) -> Tuple[LinkType, str]:
def filter_unallowed_hashes(
- candidates: List[InstallationCandidate],
- hashes: Optional[Hashes],
+ candidates: list[InstallationCandidate],
+ hashes: Hashes | None,
project_name: str,
-) -> List[InstallationCandidate]:
+) -> list[InstallationCandidate]:
"""
Filter out candidates whose hashes aren't allowed, and return a new
list of candidates.
@@ -331,7 +381,7 @@ class CandidatePreferences:
"""
prefer_binary: bool = False
- allow_all_prereleases: bool = False
+ release_control: ReleaseControl | None = None
@dataclass(frozen=True)
@@ -347,9 +397,9 @@ class BestCandidateResult:
if no applicable candidates were found.
"""
- all_candidates: List[InstallationCandidate]
- applicable_candidates: List[InstallationCandidate]
- best_candidate: Optional[InstallationCandidate]
+ all_candidates: list[InstallationCandidate]
+ applicable_candidates: list[InstallationCandidate]
+ best_candidate: InstallationCandidate | None
def __post_init__(self) -> None:
assert set(self.applicable_candidates) <= set(self.all_candidates)
@@ -370,12 +420,12 @@ class CandidateEvaluator:
def create(
cls,
project_name: str,
- target_python: Optional[TargetPython] = None,
+ target_python: TargetPython | None = None,
prefer_binary: bool = False,
- allow_all_prereleases: bool = False,
- specifier: Optional[specifiers.BaseSpecifier] = None,
- hashes: Optional[Hashes] = None,
- ) -> "CandidateEvaluator":
+ release_control: ReleaseControl | None = None,
+ specifier: specifiers.BaseSpecifier | None = None,
+ hashes: Hashes | None = None,
+ ) -> CandidateEvaluator:
"""Create a CandidateEvaluator object.
:param target_python: The target Python interpreter to use when
@@ -398,24 +448,24 @@ def create(
supported_tags=supported_tags,
specifier=specifier,
prefer_binary=prefer_binary,
- allow_all_prereleases=allow_all_prereleases,
+ release_control=release_control,
hashes=hashes,
)
def __init__(
self,
project_name: str,
- supported_tags: List[Tag],
+ supported_tags: list[Tag],
specifier: specifiers.BaseSpecifier,
prefer_binary: bool = False,
- allow_all_prereleases: bool = False,
- hashes: Optional[Hashes] = None,
+ release_control: ReleaseControl | None = None,
+ hashes: Hashes | None = None,
) -> None:
"""
:param supported_tags: The PEP 425 tags supported by the target
Python in order of preference (most preferred first).
"""
- self._allow_all_prereleases = allow_all_prereleases
+ self._release_control = release_control
self._hashes = hashes
self._prefer_binary = prefer_binary
self._project_name = project_name
@@ -430,23 +480,33 @@ def __init__(
def get_applicable_candidates(
self,
- candidates: List[InstallationCandidate],
- ) -> List[InstallationCandidate]:
+ candidates: list[InstallationCandidate],
+ ) -> list[InstallationCandidate]:
"""
Return the applicable candidates from a list of candidates.
"""
# Using None infers from the specifier instead.
- allow_prereleases = self._allow_all_prereleases or None
+ if self._release_control is not None:
+ allow_prereleases = self._release_control.allows_prereleases(
+ canonicalize_name(self._project_name)
+ )
+ else:
+ allow_prereleases = None
specifier = self._specifier
- # 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
+ # When using the pkg_resources backend 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]
+ if select_backend().NAME == "pkg_resources":
+ candidates_and_versions: list[
+ tuple[InstallationCandidate, str | Version]
+ ] = [(c, str(c.version)) for c in candidates]
+ else:
+ candidates_and_versions = [(c, c.version) for c in candidates]
versions = set(
specifier.filter(
(v for _, v in candidates_and_versions),
@@ -514,11 +574,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))
@@ -534,8 +590,8 @@ def _sort_key(self, candidate: InstallationCandidate) -> CandidateSortingKey:
def sort_best_candidate(
self,
- candidates: List[InstallationCandidate],
- ) -> Optional[InstallationCandidate]:
+ candidates: list[InstallationCandidate],
+ ) -> InstallationCandidate | None:
"""
Return the best candidate per the instance's sort order, or None if
no candidate is acceptable.
@@ -547,7 +603,7 @@ def sort_best_candidate(
def compute_best_candidate(
self,
- candidates: List[InstallationCandidate],
+ candidates: list[InstallationCandidate],
) -> BestCandidateResult:
"""
Compute and return a `BestCandidateResult` instance.
@@ -575,9 +631,10 @@ def __init__(
link_collector: LinkCollector,
target_python: TargetPython,
allow_yanked: bool,
- format_control: Optional[FormatControl] = None,
- candidate_prefs: Optional[CandidatePreferences] = None,
- ignore_requires_python: Optional[bool] = None,
+ format_control: FormatControl | None = None,
+ candidate_prefs: CandidatePreferences | None = None,
+ ignore_requires_python: bool | None = None,
+ uploaded_prior_to: datetime.datetime | None = None,
) -> None:
"""
This constructor is primarily meant to be used by the create() class
@@ -599,11 +656,19 @@ def __init__(
self._ignore_requires_python = ignore_requires_python
self._link_collector = link_collector
self._target_python = target_python
+ self._uploaded_prior_to = uploaded_prior_to
self.format_control = format_control
# These are boring links that have already been logged somehow.
- self._logged_links: Set[Tuple[Link, LinkType, str]] = set()
+ self._logged_links: set[tuple[Link, LinkType, str]] = set()
+
+ # Cache of the result of finding candidates
+ self._all_candidates: dict[str, list[InstallationCandidate]] = {}
+ self._best_candidates: dict[
+ tuple[str, specifiers.BaseSpecifier | None, Hashes | None],
+ BestCandidateResult,
+ ] = {}
# Don't include an allow_yanked default value to make sure each call
# site considers whether yanked releases are allowed. This also causes
@@ -614,8 +679,9 @@ def create(
cls,
link_collector: LinkCollector,
selection_prefs: SelectionPreferences,
- target_python: Optional[TargetPython] = None,
- ) -> "PackageFinder":
+ target_python: TargetPython | None = None,
+ uploaded_prior_to: datetime.datetime | None = None,
+ ) -> PackageFinder:
"""Create a PackageFinder.
:param selection_prefs: The candidate selection preferences, as a
@@ -623,13 +689,15 @@ def create(
:param target_python: The target Python interpreter to use when
checking compatibility. If None (the default), a TargetPython
object will be constructed from the running Python.
+ :param uploaded_prior_to: If set, only find links uploaded prior
+ to the given datetime.
"""
if target_python is None:
target_python = TargetPython()
candidate_prefs = CandidatePreferences(
prefer_binary=selection_prefs.prefer_binary,
- allow_all_prereleases=selection_prefs.allow_all_prereleases,
+ release_control=selection_prefs.release_control,
)
return cls(
@@ -639,6 +707,7 @@ def create(
allow_yanked=selection_prefs.allow_yanked,
format_control=selection_prefs.format_control,
ignore_requires_python=selection_prefs.ignore_requires_python,
+ uploaded_prior_to=uploaded_prior_to,
)
@property
@@ -654,15 +723,15 @@ def search_scope(self, search_scope: SearchScope) -> None:
self._link_collector.search_scope = search_scope
@property
- def find_links(self) -> List[str]:
+ def find_links(self) -> list[str]:
return self._link_collector.find_links
@property
- def index_urls(self) -> List[str]:
+ def index_urls(self) -> list[str]:
return self.search_scope.index_urls
@property
- def proxy(self) -> Optional[str]:
+ def proxy(self) -> str | None:
return self._link_collector.session.pip_proxy
@property
@@ -671,7 +740,7 @@ def trusted_hosts(self) -> Iterable[str]:
yield build_netloc(*host_port)
@property
- def custom_cert(self) -> Optional[str]:
+ def custom_cert(self) -> str | None:
# 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.
@@ -679,17 +748,17 @@ def custom_cert(self) -> Optional[str]:
return verify if isinstance(verify, str) else None
@property
- def client_cert(self) -> Optional[str]:
+ def client_cert(self) -> str | None:
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
+ def release_control(self) -> ReleaseControl | None:
+ return self._candidate_prefs.release_control
- def set_allow_all_prereleases(self) -> None:
- self._candidate_prefs.allow_all_prereleases = True
+ def set_release_control(self, release_control: ReleaseControl) -> None:
+ self._candidate_prefs.release_control = release_control
@property
def prefer_binary(self) -> bool:
@@ -698,7 +767,11 @@ def prefer_binary(self) -> bool:
def set_prefer_binary(self) -> None:
self._candidate_prefs.prefer_binary = True
- def requires_python_skipped_reasons(self) -> List[str]:
+ @property
+ def uploaded_prior_to(self) -> datetime.datetime | None:
+ return self._uploaded_prior_to
+
+ def requires_python_skipped_reasons(self) -> list[str]:
reasons = {
detail
for _, result, detail in self._logged_links
@@ -717,15 +790,16 @@ def make_link_evaluator(self, project_name: str) -> LinkEvaluator:
target_python=self._target_python,
allow_yanked=self._allow_yanked,
ignore_requires_python=self._ignore_requires_python,
+ uploaded_prior_to=self._uploaded_prior_to,
)
- def _sort_links(self, links: Iterable[Link]) -> List[Link]:
+ def _sort_links(self, links: Iterable[Link]) -> list[Link]:
"""
Returns elements of links in order, non-egg links first, egg links
second, while eliminating duplicates
"""
eggs, no_eggs = [], []
- seen: Set[Link] = set()
+ seen: set[Link] = set()
for link in links:
if link not in seen:
seen.add(link)
@@ -736,11 +810,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
@@ -750,12 +819,16 @@ def _log_skipped_link(self, link: Link, result: LinkType, detail: str) -> None:
def get_install_candidate(
self, link_evaluator: LinkEvaluator, link: Link
- ) -> Optional[InstallationCandidate]:
+ ) -> InstallationCandidate | None:
"""
If the link is a candidate for install, convert it to an
InstallationCandidate and return it. Otherwise, return None.
"""
result, detail = link_evaluator.evaluate_link(link)
+ if result == LinkType.upload_time_missing:
+ # Fail immediately if the index doesn't provide upload-time
+ # when --uploaded-prior-to is specified
+ raise InstallationError(detail)
if result != LinkType.candidate:
self._log_skipped_link(link, result, detail)
return None
@@ -771,7 +844,7 @@ def get_install_candidate(
def evaluate_links(
self, link_evaluator: LinkEvaluator, links: Iterable[Link]
- ) -> List[InstallationCandidate]:
+ ) -> list[InstallationCandidate]:
"""
Convert links that are candidates to InstallationCandidate objects.
"""
@@ -785,7 +858,7 @@ def evaluate_links(
def process_project_url(
self, project_url: Link, link_evaluator: LinkEvaluator
- ) -> List[InstallationCandidate]:
+ ) -> list[InstallationCandidate]:
logger.debug(
"Fetching project page and analyzing links: %s",
project_url,
@@ -804,8 +877,7 @@ def process_project_url(
return package_links
- @functools.lru_cache(maxsize=None)
- def find_all_candidates(self, project_name: str) -> List[InstallationCandidate]:
+ def find_all_candidates(self, project_name: str) -> list[InstallationCandidate]:
"""Find all available InstallationCandidate for project_name
This checks index_urls and find_links.
@@ -814,6 +886,9 @@ def find_all_candidates(self, project_name: str) -> List[InstallationCandidate]:
See LinkEvaluator.evaluate_link() for details on which files
are accepted.
"""
+ if project_name in self._all_candidates:
+ return self._all_candidates[project_name]
+
link_evaluator = self.make_link_evaluator(project_name)
collected_sources = self._link_collector.collect_sources(
@@ -855,13 +930,15 @@ def find_all_candidates(self, project_name: str) -> List[InstallationCandidate]:
logger.debug("Local files found: %s", ", ".join(paths))
# This is an intentional priority ordering
- return file_candidates + page_candidates
+ self._all_candidates[project_name] = file_candidates + page_candidates
+
+ return self._all_candidates[project_name]
def make_candidate_evaluator(
self,
project_name: str,
- specifier: Optional[specifiers.BaseSpecifier] = None,
- hashes: Optional[Hashes] = None,
+ specifier: specifiers.BaseSpecifier | None = None,
+ hashes: Hashes | None = None,
) -> CandidateEvaluator:
"""Create a CandidateEvaluator object to use."""
candidate_prefs = self._candidate_prefs
@@ -869,17 +946,16 @@ def make_candidate_evaluator(
project_name=project_name,
target_python=self._target_python,
prefer_binary=candidate_prefs.prefer_binary,
- allow_all_prereleases=candidate_prefs.allow_all_prereleases,
+ release_control=candidate_prefs.release_control,
specifier=specifier,
hashes=hashes,
)
- @functools.lru_cache(maxsize=None)
def find_best_candidate(
self,
project_name: str,
- specifier: Optional[specifiers.BaseSpecifier] = None,
- hashes: Optional[Hashes] = None,
+ specifier: specifiers.BaseSpecifier | None = None,
+ hashes: Hashes | None = None,
) -> BestCandidateResult:
"""Find matches for the given project and specifier.
@@ -889,32 +965,42 @@ def find_best_candidate(
:return: A `BestCandidateResult` instance.
"""
+ if (project_name, specifier, hashes) in self._best_candidates:
+ return self._best_candidates[project_name, specifier, hashes]
+
candidates = self.find_all_candidates(project_name)
candidate_evaluator = self.make_candidate_evaluator(
project_name=project_name,
specifier=specifier,
hashes=hashes,
)
- return candidate_evaluator.compute_best_candidate(candidates)
+ self._best_candidates[project_name, specifier, hashes] = (
+ candidate_evaluator.compute_best_candidate(candidates)
+ )
+
+ return self._best_candidates[project_name, specifier, hashes]
def find_requirement(
self, req: InstallRequirement, upgrade: bool
- ) -> Optional[InstallationCandidate]:
+ ) -> InstallationCandidate | None:
"""Try to find a Link matching req
Expects req, an InstallRequirement and upgrade, a boolean
Returns a InstallationCandidate if found,
Raises DistributionNotFound or BestVersionAlreadyInstalled otherwise
"""
+ name = req.name
+ assert name is not None, "find_requirement() called with no name"
+
hashes = req.hashes(trust_internet=False)
best_candidate_result = self.find_best_candidate(
- req.name,
+ name,
specifier=req.specifier,
hashes=hashes,
)
best_candidate = best_candidate_result.best_candidate
- installed_version: Optional[_BaseVersion] = None
+ installed_version: _BaseVersion | None = None
if req.satisfied_by is not None:
installed_version = req.satisfied_by.version
@@ -934,9 +1020,19 @@ def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str:
)
if installed_version is None and best_candidate is None:
+ # Check if only final releases are allowed for this package
+ version_type = "version"
+ if self.release_control is not None:
+ allows_pre = self.release_control.allows_prereleases(
+ canonicalize_name(name)
+ )
+ if allows_pre is False:
+ version_type = "final version"
+
logger.critical(
- "Could not find a version that satisfies the requirement %s "
+ "Could not find a %s that satisfies the requirement %s "
"(from versions: %s)",
+ version_type,
req,
_format_versions(best_candidate_result.all_candidates),
)
@@ -944,8 +1040,8 @@ def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str:
raise DistributionNotFound(f"No matching distribution found for {req}")
def _should_install_candidate(
- candidate: Optional[InstallationCandidate],
- ) -> "TypeGuard[InstallationCandidate]":
+ candidate: InstallationCandidate | None,
+ ) -> TypeGuard[InstallationCandidate]:
if installed_version is None:
return True
if best_candidate is None:
@@ -1011,7 +1107,7 @@ def _find_name_version_sep(fragment: str, canonical_name: str) -> int:
raise ValueError(f"{fragment} does not match {canonical_name}")
-def _extract_version_from_fragment(fragment: str, canonical_name: str) -> Optional[str]:
+def _extract_version_from_fragment(fragment: str, canonical_name: str) -> str | None:
"""Parse the version string from a + filename
"fragment" (stem) or egg fragment.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/index/sources.py b/addons/source-python/packages/site-packages/pip/_internal/index/sources.py
index 3dafb30e6..c67c4d736 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/index/sources.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/index/sources.py
@@ -1,8 +1,11 @@
+from __future__ import annotations
+
import logging
import mimetypes
import os
from collections import defaultdict
-from typing import Callable, Dict, Iterable, List, Optional, Tuple
+from collections.abc import Iterable
+from typing import Callable
from pip._vendor.packaging.utils import (
InvalidSdistFilename,
@@ -27,7 +30,7 @@
class LinkSource:
@property
- def link(self) -> Optional[Link]:
+ def link(self) -> Link | None:
"""Returns the underlying link, if there's one."""
raise NotImplementedError()
@@ -49,8 +52,8 @@ class _FlatDirectoryToUrls:
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._page_candidates: list[str] = []
+ self._project_name_to_urls: dict[str, list[str]] = defaultdict(list)
self._scanned_directory = False
def _scan_directory(self) -> None:
@@ -77,14 +80,14 @@ def _scan_directory(self) -> None:
self._scanned_directory = True
@property
- def page_candidates(self) -> List[str]:
+ 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]]:
+ def project_name_to_urls(self) -> dict[str, list[str]]:
if not self._scanned_directory:
self._scan_directory()
@@ -100,7 +103,7 @@ class _FlatDirectorySource(LinkSource):
* ``file_candidates``: Archives in the directory.
"""
- _paths_to_urls: Dict[str, _FlatDirectoryToUrls] = {}
+ _paths_to_urls: dict[str, _FlatDirectoryToUrls] = {}
def __init__(
self,
@@ -119,7 +122,7 @@ def __init__(
self._paths_to_urls[path] = self._path_to_urls
@property
- def link(self) -> Optional[Link]:
+ def link(self) -> Link | None:
return None
def page_candidates(self) -> FoundCandidates:
@@ -150,7 +153,7 @@ def __init__(
self._link = link
@property
- def link(self) -> Optional[Link]:
+ def link(self) -> Link | None:
return self._link
def page_candidates(self) -> FoundCandidates:
@@ -184,7 +187,7 @@ def __init__(
self._link = link
@property
- def link(self) -> Optional[Link]:
+ def link(self) -> Link | None:
return self._link
def page_candidates(self) -> FoundCandidates:
@@ -212,7 +215,7 @@ def __init__(
self._link = link
@property
- def link(self) -> Optional[Link]:
+ def link(self) -> Link | None:
return self._link
def page_candidates(self) -> FoundCandidates:
@@ -230,9 +233,9 @@ def build_source(
expand_dir: bool,
cache_link_parsing: bool,
project_name: str,
-) -> Tuple[Optional[str], Optional[LinkSource]]:
- path: Optional[str] = None
- url: Optional[str] = None
+) -> tuple[str | None, LinkSource | None]:
+ path: str | None = None
+ url: str | None = None
if os.path.exists(location): # Is a local path.
url = path_to_url(location)
path = location
diff --git a/addons/source-python/packages/site-packages/pip/_internal/locations/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/locations/__init__.py
index 32382be7f..c0b63205f 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/locations/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/locations/__init__.py
@@ -1,10 +1,11 @@
+from __future__ import annotations
+
import functools
import logging
import os
import pathlib
import sys
import sysconfig
-from typing import Any, Dict, Generator, Optional, Tuple
from pip._internal.models.scheme import SCHEME_KEYS, Scheme
from pip._internal.utils.compat import WINDOWS
@@ -87,7 +88,7 @@ def _looks_like_bpo_44860() -> bool:
return unix_user_platlib == "$usersite"
-def _looks_like_red_hat_patched_platlib_purelib(scheme: Dict[str, str]) -> bool:
+def _looks_like_red_hat_patched_platlib_purelib(scheme: dict[str, str]) -> bool:
platlib = scheme["platlib"]
if "/$platlibdir/" in platlib:
platlib = platlib.replace("/$platlibdir/", f"/{_PLATLIBDIR}/")
@@ -97,7 +98,7 @@ def _looks_like_red_hat_patched_platlib_purelib(scheme: Dict[str, str]) -> bool:
return unpatched.replace("$platbase/", "$base/") == scheme["purelib"]
-@functools.lru_cache(maxsize=None)
+@functools.cache
def _looks_like_red_hat_lib() -> bool:
"""Red Hat patches platlib in unix_prefix and unix_home, but not purelib.
@@ -112,7 +113,7 @@ def _looks_like_red_hat_lib() -> bool:
)
-@functools.lru_cache(maxsize=None)
+@functools.cache
def _looks_like_debian_scheme() -> bool:
"""Debian adds two additional schemes."""
from distutils.command.install import INSTALL_SCHEMES
@@ -120,7 +121,7 @@ def _looks_like_debian_scheme() -> bool:
return "deb_system" in INSTALL_SCHEMES and "unix_local" in INSTALL_SCHEMES
-@functools.lru_cache(maxsize=None)
+@functools.cache
def _looks_like_red_hat_scheme() -> bool:
"""Red Hat patches ``sys.prefix`` and ``sys.exec_prefix``.
@@ -132,7 +133,7 @@ def _looks_like_red_hat_scheme() -> bool:
from distutils.command.install import install
from distutils.dist import Distribution
- cmd: Any = install(Distribution())
+ cmd = install(Distribution())
cmd.finalize_options()
return (
cmd.exec_prefix == f"{os.path.normpath(sys.exec_prefix)}/local"
@@ -140,7 +141,7 @@ def _looks_like_red_hat_scheme() -> bool:
)
-@functools.lru_cache(maxsize=None)
+@functools.cache
def _looks_like_slackware_scheme() -> bool:
"""Slackware patches sysconfig but fails to patch distutils and site.
@@ -156,7 +157,7 @@ def _looks_like_slackware_scheme() -> bool:
return "/lib64/" in paths["purelib"] and "/lib64/" not in user_site
-@functools.lru_cache(maxsize=None)
+@functools.cache
def _looks_like_msys2_mingw_scheme() -> bool:
"""MSYS2 patches distutils and sysconfig to use a UNIX-like scheme.
@@ -174,23 +175,7 @@ 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)
+@functools.cache
def _warn_mismatched(old: pathlib.Path, new: pathlib.Path, *, key: str) -> None:
issue_url = "https://github.com/pypa/pip/issues/10151"
message = (
@@ -208,13 +193,13 @@ def _warn_if_mismatch(old: pathlib.Path, new: pathlib.Path, *, key: str) -> bool
return True
-@functools.lru_cache(maxsize=None)
+@functools.cache
def _log_context(
*,
user: bool = False,
- home: Optional[str] = None,
- root: Optional[str] = None,
- prefix: Optional[str] = None,
+ home: str | None = None,
+ root: str | None = None,
+ prefix: str | None = None,
) -> None:
parts = [
"Additional context:",
@@ -230,10 +215,10 @@ def _log_context(
def get_scheme(
dist_name: str,
user: bool = False,
- home: Optional[str] = None,
- root: Optional[str] = None,
+ home: str | None = None,
+ root: str | None = None,
isolated: bool = False,
- prefix: Optional[str] = None,
+ prefix: str | None = None,
) -> Scheme:
new = _sysconfig.get_scheme(
dist_name,
@@ -297,14 +282,13 @@ def get_scheme(
continue
# On Python 3.9+, sysconfig's posix_user scheme sets platlib against
- # sys.platlibdir, but distutils's unix_user incorrectly coninutes
+ # sys.platlibdir, but distutils's unix_user incorrectly continues
# using the same $usersite for both platlib and purelib. This creates a
# mismatch when sys.platlibdir is not "lib".
skip_bpo_44860 = (
user
and k == "platlib"
and not WINDOWS
- and sys.version_info >= (3, 9)
and _PLATLIBDIR != "lib"
and _looks_like_bpo_44860()
)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/locations/_distutils.py b/addons/source-python/packages/site-packages/pip/_internal/locations/_distutils.py
index 3d8562569..28c066bce 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/locations/_distutils.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/locations/_distutils.py
@@ -9,6 +9,8 @@
#
# See https://github.com/pypa/pip/issues/8761 for the original discussion and
# rationale for why this is done within pip.
+from __future__ import annotations
+
try:
__import__("_distutils_hack").remove_shim()
except (ImportError, AttributeError):
@@ -21,7 +23,6 @@
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
from pip._internal.models.scheme import Scheme
from pip._internal.utils.compat import WINDOWS
@@ -35,19 +36,19 @@
def distutils_scheme(
dist_name: str,
user: bool = False,
- home: Optional[str] = None,
- root: Optional[str] = None,
+ home: str | None = None,
+ root: str | None = None,
isolated: bool = False,
- prefix: Optional[str] = None,
+ prefix: str | None = None,
*,
ignore_config_files: bool = False,
-) -> Dict[str, str]:
+) -> dict[str, str]:
"""
Return a distutils install scheme
"""
from distutils.dist import Distribution
- dist_args: Dict[str, Union[str, List[str]]] = {"name": dist_name}
+ dist_args: dict[str, str | list[str]] = {"name": dist_name}
if isolated:
dist_args["script_args"] = ["--no-user-cfg"]
@@ -61,7 +62,7 @@ def distutils_scheme(
"Ignore distutils configs in %s due to encoding errors.",
", ".join(os.path.basename(p) for p in paths),
)
- obj: Optional[DistutilsCommand] = None
+ obj: DistutilsCommand | None = None
obj = d.get_command_obj("install", create=True)
assert obj is not None
i: distutils_install_command = obj
@@ -78,7 +79,7 @@ def distutils_scheme(
i.root = root or i.root
i.finalize_options()
- scheme: Dict[str, str] = {}
+ scheme: dict[str, str] = {}
for key in SCHEME_KEYS:
scheme[key] = getattr(i, "install_" + key)
@@ -115,10 +116,10 @@ def distutils_scheme(
def get_scheme(
dist_name: str,
user: bool = False,
- home: Optional[str] = None,
- root: Optional[str] = None,
+ home: str | None = None,
+ root: str | None = None,
isolated: bool = False,
- prefix: Optional[str] = None,
+ prefix: str | None = None,
) -> Scheme:
"""
Get the "scheme" corresponding to the input parameters. The distutils
diff --git a/addons/source-python/packages/site-packages/pip/_internal/locations/_sysconfig.py b/addons/source-python/packages/site-packages/pip/_internal/locations/_sysconfig.py
index ca860ea56..0d0233bb8 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/locations/_sysconfig.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/locations/_sysconfig.py
@@ -1,8 +1,10 @@
+from __future__ import annotations
+
import logging
import os
import sys
import sysconfig
-import typing
+from typing import Callable
from pip._internal.exceptions import InvalidSchemeCombination, UserInstallationInvalid
from pip._internal.models.scheme import SCHEME_KEYS, Scheme
@@ -23,7 +25,9 @@
_AVAILABLE_SCHEMES = set(sysconfig.get_scheme_names())
-_PREFERRED_SCHEME_API = getattr(sysconfig, "get_preferred_scheme", None)
+_PREFERRED_SCHEME_API: Callable[[str], str] | None = getattr(
+ sysconfig, "get_preferred_scheme", None
+)
def _should_use_osx_framework_prefix() -> bool:
@@ -124,10 +128,10 @@ def _infer_home() -> str:
def get_scheme(
dist_name: str,
user: bool = False,
- home: typing.Optional[str] = None,
- root: typing.Optional[str] = None,
+ home: str | None = None,
+ root: str | None = None,
isolated: bool = False,
- prefix: typing.Optional[str] = None,
+ prefix: str | None = None,
) -> Scheme:
"""
Get the "scheme" corresponding to the input parameters.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/locations/base.py b/addons/source-python/packages/site-packages/pip/_internal/locations/base.py
index 3f9f896e6..17cd0e875 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/locations/base.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/locations/base.py
@@ -1,9 +1,10 @@
+from __future__ import annotations
+
import functools
import os
import site
import sys
import sysconfig
-import typing
from pip._internal.exceptions import InstallationError
from pip._internal.utils import appdirs
@@ -71,11 +72,11 @@ def get_src_prefix() -> str:
try:
# Use getusersitepackages if this is present, as it ensures that the
# value is initialised properly.
- user_site: typing.Optional[str] = site.getusersitepackages()
+ user_site: str | None = site.getusersitepackages()
except AttributeError:
user_site = site.USER_SITE
-@functools.lru_cache(maxsize=None)
+@functools.cache
def is_osx_framework() -> bool:
return bool(sysconfig.get_config_var("PYTHONFRAMEWORK"))
diff --git a/addons/source-python/packages/site-packages/pip/_internal/main.py b/addons/source-python/packages/site-packages/pip/_internal/main.py
index 33c6d24cd..ec52c4e0c 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/main.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/main.py
@@ -1,7 +1,7 @@
-from typing import List, Optional
+from __future__ import annotations
-def main(args: Optional[List[str]] = None) -> int:
+def main(args: list[str] | None = None) -> int:
"""This is preserved for old console scripts that may still be referencing
it.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/metadata/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/metadata/__init__.py
index 1ea1e7fd2..1c24efcde 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/metadata/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/metadata/__init__.py
@@ -1,17 +1,18 @@
+from __future__ import annotations
+
import contextlib
import functools
import os
import sys
-from typing import TYPE_CHECKING, List, Optional, Type, cast
+from typing import TYPE_CHECKING, Literal, Protocol, cast
+from pip._internal.utils.deprecation import deprecated
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
+ from pip._vendor.packaging.utils import NormalizedName
__all__ = [
"BaseDistribution",
@@ -30,37 +31,75 @@ 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))
+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]
- Environment: Type[BaseEnvironment]
+ NAME: Literal["importlib", "pkg_resources"]
+ Distribution: type[BaseDistribution]
+ Environment: type[BaseEnvironment]
-@functools.lru_cache(maxsize=None)
+@functools.cache
def select_backend() -> Backend:
if _should_use_importlib_metadata():
from . import importlib
return cast(Backend, importlib)
+
+ _emit_pkg_resources_deprecation_if_needed()
+
from . import pkg_resources
return cast(Backend, pkg_resources)
@@ -76,7 +115,7 @@ def get_default_environment() -> BaseEnvironment:
return select_backend().Environment.default()
-def get_environment(paths: Optional[List[str]]) -> BaseEnvironment:
+def get_environment(paths: list[str] | None) -> BaseEnvironment:
"""Get a representation of the environment specified by ``paths``.
This returns an Environment instance from the chosen backend based on the
@@ -95,7 +134,9 @@ def get_directory_distribution(directory: str) -> BaseDistribution:
return select_backend().Distribution.from_directory(directory)
-def get_wheel_distribution(wheel: Wheel, canonical_name: str) -> BaseDistribution:
+def get_wheel_distribution(
+ wheel: Wheel, canonical_name: NormalizedName
+) -> BaseDistribution:
"""Get the representation of the specified wheel's distribution metadata.
This returns a Distribution instance from the chosen backend based on
diff --git a/addons/source-python/packages/site-packages/pip/_internal/metadata/_json.py b/addons/source-python/packages/site-packages/pip/_internal/metadata/_json.py
index f3aeab322..b39ac0545 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/metadata/_json.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/metadata/_json.py
@@ -1,8 +1,9 @@
# Extracted from https://github.com/pfmoore/pkg_metadata
+from __future__ import annotations
from email.header import Header, decode_header, make_header
from email.message import Message
-from typing import Any, Dict, List, Union, cast
+from typing import Any, cast
METADATA_FIELDS = [
# Name, Multiple-Use
@@ -40,10 +41,10 @@ def json_name(field: str) -> str:
return field.lower().replace("-", "_")
-def msg_to_json(msg: Message) -> Dict[str, Any]:
+def msg_to_json(msg: Message) -> dict[str, Any]:
"""Convert a Message object into a JSON-compatible dictionary."""
- def sanitise_header(h: Union[Header, str]) -> str:
+ def sanitise_header(h: Header | str) -> str:
if isinstance(h, Header):
chunks = []
for bytes, encoding in decode_header(h):
@@ -65,7 +66,7 @@ def sanitise_header(h: Union[Header, str]) -> str:
continue
key = json_name(field)
if multi:
- value: Union[str, List[str]] = [
+ value: str | list[str] = [
sanitise_header(v) for v in msg.get_all(field) # type: ignore
]
else:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/metadata/base.py b/addons/source-python/packages/site-packages/pip/_internal/metadata/base.py
index 9eabcdb27..230e11473 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/metadata/base.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/metadata/base.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import csv
import email.message
import functools
@@ -6,19 +8,12 @@
import pathlib
import re
import zipfile
+from collections.abc import Collection, Container, Iterable, Iterator
from typing import (
IO,
Any,
- Collection,
- Container,
- Dict,
- Iterable,
- Iterator,
- List,
NamedTuple,
- Optional,
Protocol,
- Tuple,
Union,
)
@@ -61,8 +56,8 @@ def group(self) -> str:
def _convert_installed_files_path(
- entry: Tuple[str, ...],
- info: Tuple[str, ...],
+ entry: tuple[str, ...],
+ info: tuple[str, ...],
) -> str:
"""Convert a legacy installed-files.txt path into modern RECORD path.
@@ -98,7 +93,7 @@ class RequiresEntry(NamedTuple):
class BaseDistribution(Protocol):
@classmethod
- def from_directory(cls, directory: str) -> "BaseDistribution":
+ def from_directory(cls, directory: str) -> BaseDistribution:
"""Load the distribution from a metadata directory.
:param directory: Path to a metadata directory, e.g. ``.dist-info``.
@@ -111,7 +106,7 @@ def from_metadata_file_contents(
metadata_contents: bytes,
filename: str,
project_name: str,
- ) -> "BaseDistribution":
+ ) -> BaseDistribution:
"""Load the distribution from the contents of a METADATA file.
This is used to implement PEP 658 by generating a "shallow" dist object that can
@@ -124,7 +119,7 @@ def from_metadata_file_contents(
raise NotImplementedError()
@classmethod
- def from_wheel(cls, wheel: "Wheel", name: str) -> "BaseDistribution":
+ def from_wheel(cls, wheel: Wheel, name: str) -> BaseDistribution:
"""Load the distribution from a given wheel.
:param wheel: A concrete wheel definition.
@@ -144,7 +139,7 @@ def __str__(self) -> str:
return f"{self.raw_name} {self.raw_version}"
@property
- def location(self) -> Optional[str]:
+ def location(self) -> str | None:
"""Where the distribution is loaded from.
A string value is not necessarily a filesystem path, since distributions
@@ -158,7 +153,7 @@ def location(self) -> Optional[str]:
raise NotImplementedError()
@property
- def editable_project_location(self) -> Optional[str]:
+ def editable_project_location(self) -> str | None:
"""The project location for editable distributions.
This is the directory where pyproject.toml or setup.py is located.
@@ -180,7 +175,7 @@ def editable_project_location(self) -> Optional[str]:
return None
@property
- def installed_location(self) -> Optional[str]:
+ def installed_location(self) -> str | None:
"""The distribution's "installed" location.
This should generally be a ``site-packages`` directory. This is
@@ -193,7 +188,7 @@ def installed_location(self) -> Optional[str]:
raise NotImplementedError()
@property
- def info_location(self) -> Optional[str]:
+ def info_location(self) -> str | None:
"""Location of the .[egg|dist]-info directory or file.
Similarly to ``location``, a string value is not necessarily a
@@ -231,7 +226,9 @@ def installed_as_egg(self) -> bool:
location = self.location
if not location:
return False
- return location.endswith(".egg")
+ # XXX if the distribution is a zipped egg, location has a trailing /
+ # so we resort to pathlib.Path to check the suffix in a reliable way.
+ return pathlib.Path(location).suffix == ".egg"
@property
def installed_with_setuptools_egg_info(self) -> bool:
@@ -288,7 +285,7 @@ def setuptools_filename(self) -> str:
return self.raw_name.replace("-", "_")
@property
- def direct_url(self) -> Optional[DirectUrl]:
+ def direct_url(self) -> DirectUrl | None:
"""Obtain a DirectUrl from this distribution.
Returns None if the distribution has no `direct_url.json` metadata,
@@ -396,7 +393,7 @@ def metadata(self) -> email.message.Message:
return metadata
@property
- def metadata_dict(self) -> Dict[str, Any]:
+ def metadata_dict(self) -> dict[str, Any]:
"""PEP 566 compliant JSON-serializable representation of METADATA or PKG-INFO.
This should return an empty dict if the metadata file is unavailable.
@@ -407,7 +404,7 @@ def metadata_dict(self) -> Dict[str, Any]:
return msg_to_json(self.metadata)
@property
- def metadata_version(self) -> Optional[str]:
+ def metadata_version(self) -> str | None:
"""Value of "Metadata-Version:" in distribution metadata, if available."""
return self.metadata.get("Metadata-Version")
@@ -461,7 +458,7 @@ def iter_provided_extras(self) -> Iterable[NormalizedName]:
"""
raise NotImplementedError()
- def _iter_declared_entries_from_record(self) -> Optional[Iterator[str]]:
+ def _iter_declared_entries_from_record(self) -> Iterator[str] | None:
try:
text = self.read_text("RECORD")
except FileNotFoundError:
@@ -469,7 +466,7 @@ def _iter_declared_entries_from_record(self) -> Optional[Iterator[str]]:
# This extra Path-str cast normalizes entries.
return (str(pathlib.Path(row[0])) for row in csv.reader(text.splitlines()))
- def _iter_declared_entries_from_legacy(self) -> Optional[Iterator[str]]:
+ def _iter_declared_entries_from_legacy(self) -> Iterator[str] | None:
try:
text = self.read_text("installed-files.txt")
except FileNotFoundError:
@@ -490,7 +487,7 @@ def _iter_declared_entries_from_legacy(self) -> Optional[Iterator[str]]:
for p in paths
)
- def iter_declared_entries(self) -> Optional[Iterator[str]]:
+ def iter_declared_entries(self) -> Iterator[str] | None:
"""Iterate through file entries declared in this distribution.
For modern .dist-info distributions, this is the files listed in the
@@ -583,14 +580,14 @@ class BaseEnvironment:
"""An environment containing distributions to introspect."""
@classmethod
- def default(cls) -> "BaseEnvironment":
+ def default(cls) -> BaseEnvironment:
raise NotImplementedError()
@classmethod
- def from_paths(cls, paths: Optional[List[str]]) -> "BaseEnvironment":
+ def from_paths(cls, paths: list[str] | None) -> BaseEnvironment:
raise NotImplementedError()
- def get_distribution(self, name: str) -> Optional["BaseDistribution"]:
+ def get_distribution(self, name: str) -> BaseDistribution | None:
"""Given a requirement name, return the installed distributions.
The name may not be normalized. The implementation must canonicalize
@@ -598,7 +595,7 @@ def get_distribution(self, name: str) -> Optional["BaseDistribution"]:
"""
raise NotImplementedError()
- def _iter_distributions(self) -> Iterator["BaseDistribution"]:
+ def _iter_distributions(self) -> Iterator[BaseDistribution]:
"""Iterate through installed distributions.
This function should be implemented by subclass, but never called
diff --git a/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_compat.py b/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_compat.py
index ec1e815cd..7de614d7f 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_compat.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_compat.py
@@ -1,6 +1,8 @@
+from __future__ import annotations
+
import importlib.metadata
import os
-from typing import Any, Optional, Protocol, Tuple, cast
+from typing import Any, Protocol, cast
from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
@@ -30,11 +32,11 @@ def name(self) -> str:
raise NotImplementedError()
@property
- def parent(self) -> "BasePath":
+ def parent(self) -> BasePath:
raise NotImplementedError()
-def get_info_location(d: importlib.metadata.Distribution) -> Optional[BasePath]:
+def get_info_location(d: importlib.metadata.Distribution) -> BasePath | None:
"""Find the path to the distribution's metadata directory.
HACK: This relies on importlib.metadata's private ``_path`` attribute. Not
@@ -48,7 +50,7 @@ def get_info_location(d: importlib.metadata.Distribution) -> Optional[BasePath]:
def parse_name_and_version_from_info_directory(
dist: importlib.metadata.Distribution,
-) -> Tuple[Optional[str], Optional[str]]:
+) -> tuple[str | None, str | None]:
"""Get a name and version from the metadata directory name.
This is much faster than reading distribution metadata.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_dists.py b/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_dists.py
index d220b616e..89364b8b7 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_dists.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_dists.py
@@ -1,17 +1,12 @@
+from __future__ import annotations
+
import email.message
import importlib.metadata
import pathlib
import zipfile
+from collections.abc import Collection, Iterable, Iterator, Mapping, Sequence
from os import PathLike
from typing import (
- Collection,
- Dict,
- Iterable,
- Iterator,
- Mapping,
- Optional,
- Sequence,
- Union,
cast,
)
@@ -33,6 +28,7 @@
from pip._internal.utils.wheel import parse_wheel, read_wheel_metadata_file
from ._compat import (
+ BadMetadata,
BasePath,
get_dist_canonical_name,
parse_name_and_version_from_info_directory,
@@ -64,7 +60,7 @@ def from_zipfile(
zf: zipfile.ZipFile,
name: str,
location: str,
- ) -> "WheelDistribution":
+ ) -> WheelDistribution:
info_dir, _ = parse_wheel(zf, name)
paths = (
(name, pathlib.PurePosixPath(name.split("/", 1)[-1]))
@@ -84,7 +80,7 @@ def iterdir(self, path: InfoPath) -> Iterator[pathlib.PurePosixPath]:
return iter(self._files)
raise FileNotFoundError(path)
- def read_text(self, filename: str) -> Optional[str]:
+ def read_text(self, filename: str) -> str | None:
try:
data = self._files[pathlib.PurePosixPath(filename)]
except KeyError:
@@ -97,7 +93,7 @@ def read_text(self, filename: str) -> Optional[str]:
raise UnsupportedWheel(error)
return text
- def locate_file(self, path: Union[str, "PathLike[str]"]) -> pathlib.Path:
+ 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
@@ -107,8 +103,8 @@ class Distribution(BaseDistribution):
def __init__(
self,
dist: importlib.metadata.Distribution,
- info_location: Optional[BasePath],
- installed_location: Optional[BasePath],
+ info_location: BasePath | None,
+ installed_location: BasePath | None,
) -> None:
self._dist = dist
self._info_location = info_location
@@ -147,19 +143,19 @@ def from_wheel(cls, wheel: Wheel, name: str) -> BaseDistribution:
return cls(dist, dist.info_location, pathlib.PurePosixPath(wheel.location))
@property
- def location(self) -> Optional[str]:
+ def location(self) -> str | None:
if self._info_location is None:
return None
return str(self._info_location.parent)
@property
- def info_location(self) -> Optional[str]:
+ def info_location(self) -> str | None:
if self._info_location is None:
return None
return str(self._info_location)
@property
- def installed_location(self) -> Optional[str]:
+ def installed_location(self) -> str | None:
if self._installed_location is None:
return None
return normalize_path(str(self._installed_location))
@@ -170,9 +166,14 @@ def canonical_name(self) -> NormalizedName:
@property
def version(self) -> Version:
- if version := parse_name_and_version_from_info_directory(self._dist)[1]:
+ try:
+ version = (
+ parse_name_and_version_from_info_directory(self._dist)[1]
+ or self._dist.version
+ )
return parse_version(version)
- return parse_version(self._dist.version)
+ except TypeError:
+ raise BadMetadata(self._dist, reason="invalid metadata entry `version`")
@property
def raw_version(self) -> str:
@@ -215,7 +216,7 @@ def iter_provided_extras(self) -> Iterable[NormalizedName]:
]
def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]:
- contexts: Sequence[Dict[str, str]] = [{"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", []):
# strip() because email.message.Message.get_all() may return a leading \n
# in case a long header was wrapped.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_envs.py b/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_envs.py
index 4d906fd31..71a73b731 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_envs.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/metadata/importlib/_envs.py
@@ -1,18 +1,22 @@
-import functools
+from __future__ import annotations
+
import importlib.metadata
import logging
import os
import pathlib
import sys
import zipfile
-import zipimport
-from typing import Iterator, List, Optional, Sequence, Set, Tuple
+from collections.abc import Iterator, Sequence
+from typing import Optional
-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
from ._compat import BadMetadata, BasePath, get_dist_canonical_name, get_info_location
@@ -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)
@@ -44,10 +50,10 @@ class _DistributionFinder:
installations as well. It's useful feature, after all.
"""
- FoundResult = Tuple[importlib.metadata.Distribution, Optional[BasePath]]
+ FoundResult = tuple[importlib.metadata.Distribution, Optional[BasePath]]
def __init__(self) -> None:
- self._found_names: Set[NormalizedName] = set()
+ self._found_names: set[NormalizedName] = set()
def _find_impl(self, location: str) -> Iterator[FoundResult]:
"""Find distributions in a location."""
@@ -77,12 +83,12 @@ def find(self, location: str) -> Iterator[BaseDistribution]:
"""
for dist, info_location in self._find_impl(location):
if info_location is None:
- installed_location: Optional[BasePath] = None
+ installed_location: BasePath | None = None
else:
installed_location = info_location.parent
yield Distribution(dist, info_location, installed_location)
- def find_linked(self, location: str) -> Iterator[BaseDistribution]:
+ def find_legacy_editables(self, location: str) -> Iterator[BaseDistribution]:
"""Read location in egg-link files and return distributions in there.
The path should be a directory; otherwise this returns nothing. This
@@ -106,54 +112,6 @@ def find_linked(self, location: str) -> Iterator[BaseDistribution]:
for dist, info_location in self._find_impl(target_location):
yield Distribution(dist, info_location, path)
- def _find_eggs_in_dir(self, location: str) -> Iterator[BaseDistribution]:
- from pip._vendor.pkg_resources import find_distributions
-
- from pip._internal.metadata import pkg_resources as legacy
-
- with os.scandir(location) as it:
- for entry in it:
- if not entry.name.endswith(".egg"):
- continue
- for dist in find_distributions(entry.path):
- yield legacy.Distribution(dist)
-
- def _find_eggs_in_zip(self, location: str) -> Iterator[BaseDistribution]:
- from pip._vendor.pkg_resources import find_eggs_in_zip
-
- from pip._internal.metadata import pkg_resources as legacy
-
- try:
- importer = zipimport.zipimporter(location)
- except zipimport.ZipImportError:
- return
- for dist in find_eggs_in_zip(importer, location):
- yield legacy.Distribution(dist)
-
- def find_eggs(self, location: str) -> Iterator[BaseDistribution]:
- """Find eggs in a location.
-
- This actually uses the old *pkg_resources* backend. We likely want to
- deprecate this so we can eventually remove the *pkg_resources*
- dependency entirely. Before that, this should first emit a deprecation
- warning for some versions when using the fallback since importing
- *pkg_resources* is slow for those who don't need it.
- """
- if os.path.isdir(location):
- yield from self._find_eggs_in_dir(location)
- if zipfile.is_zipfile(location):
- yield from self._find_eggs_in_zip(location)
-
-
-@functools.lru_cache(maxsize=None) # Warn a distribution exactly once.
-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="25.1",
- issue=12330,
- )
-
class Environment(BaseEnvironment):
def __init__(self, paths: Sequence[str]) -> None:
@@ -164,7 +122,7 @@ def default(cls) -> BaseEnvironment:
return cls(sys.path)
@classmethod
- def from_paths(cls, paths: Optional[List[str]]) -> BaseEnvironment:
+ def from_paths(cls, paths: list[str] | None) -> BaseEnvironment:
if paths is None:
return cls(sys.path)
return cls(paths)
@@ -173,13 +131,9 @@ 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
- # This must go last because that's how pkg_resources tie-breaks.
- yield from finder.find_linked(location)
+ yield from finder.find_legacy_editables(location)
- def get_distribution(self, name: str) -> Optional[BaseDistribution]:
+ def get_distribution(self, name: str) -> BaseDistribution | None:
canonical_name = canonicalize_name(name)
matches = (
distribution
diff --git a/addons/source-python/packages/site-packages/pip/_internal/metadata/pkg_resources.py b/addons/source-python/packages/site-packages/pip/_internal/metadata/pkg_resources.py
index 4ea84f93a..89fce8b6e 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/metadata/pkg_resources.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/metadata/pkg_resources.py
@@ -1,16 +1,13 @@
+from __future__ import annotations
+
import email.message
import email.parser
import logging
import os
import zipfile
+from collections.abc import Collection, Iterable, Iterator, Mapping
from typing import (
- Collection,
- Iterable,
- Iterator,
- List,
- Mapping,
NamedTuple,
- Optional,
)
from pip._vendor import pkg_resources
@@ -73,7 +70,7 @@ def get_metadata_lines(self, name: str) -> Iterable[str]:
def metadata_isdir(self, name: str) -> bool:
return False
- def metadata_listdir(self, name: str) -> List[str]:
+ def metadata_listdir(self, name: str) -> list[str]:
return []
def run_script(self, script_name: str, namespace: str) -> None:
@@ -85,7 +82,7 @@ def __init__(self, dist: pkg_resources.Distribution) -> None:
self._dist = dist
# This is populated lazily, to avoid loading metadata for all possible
# distributions eagerly.
- self.__extra_mapping: Optional[Mapping[NormalizedName, str]] = None
+ self.__extra_mapping: Mapping[NormalizedName, str] | None = None
@property
def _extra_mapping(self) -> Mapping[NormalizedName, str]:
@@ -155,11 +152,11 @@ def from_wheel(cls, wheel: Wheel, name: str) -> BaseDistribution:
return cls(dist)
@property
- def location(self) -> Optional[str]:
+ def location(self) -> str | None:
return self._dist.location
@property
- def installed_location(self) -> Optional[str]:
+ def installed_location(self) -> str | None:
egg_link = egg_link_path_from_location(self.raw_name)
if egg_link:
location = egg_link
@@ -170,7 +167,7 @@ def installed_location(self) -> Optional[str]:
return normalize_path(location)
@property
- def info_location(self) -> Optional[str]:
+ def info_location(self) -> str | None:
return self._dist.egg_info
@property
@@ -259,14 +256,14 @@ def default(cls) -> BaseEnvironment:
return cls(pkg_resources.working_set)
@classmethod
- def from_paths(cls, paths: Optional[List[str]]) -> BaseEnvironment:
+ def from_paths(cls, paths: list[str] | None) -> BaseEnvironment:
return cls(pkg_resources.WorkingSet(paths))
def _iter_distributions(self) -> Iterator[BaseDistribution]:
for dist in self._ws:
yield Distribution(dist)
- def _search_distribution(self, name: str) -> Optional[BaseDistribution]:
+ def _search_distribution(self, name: str) -> BaseDistribution | None:
"""Find a distribution matching the ``name`` in the environment.
This searches from *all* distributions available in the environment, to
@@ -278,7 +275,7 @@ def _search_distribution(self, name: str) -> Optional[BaseDistribution]:
return dist
return None
- def get_distribution(self, name: str) -> Optional[BaseDistribution]:
+ def get_distribution(self, name: str) -> BaseDistribution | None:
# Search the distribution by looking through the working set.
dist = self._search_distribution(name)
if dist:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/models/__init__.py
index 7855226e4..7b1fc2950 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_internal/models/direct_url.py b/addons/source-python/packages/site-packages/pip/_internal/models/direct_url.py
index fc5ec8d4a..aefc670cd 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/direct_url.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/direct_url.py
@@ -1,10 +1,13 @@
-""" PEP 610 """
+"""PEP 610"""
+
+from __future__ import annotations
import json
import re
import urllib.parse
+from collections.abc import Iterable
from dataclasses import dataclass
-from typing import Any, ClassVar, Dict, Iterable, Optional, Type, TypeVar, Union
+from typing import Any, ClassVar, TypeVar, Union
__all__ = [
"DirectUrl",
@@ -25,8 +28,8 @@ class DirectUrlValidationError(Exception):
def _get(
- d: Dict[str, Any], expected_type: Type[T], key: str, default: Optional[T] = None
-) -> Optional[T]:
+ d: dict[str, Any], expected_type: type[T], key: str, default: T | None = None
+) -> T | None:
"""Get value from dictionary and verify expected type."""
if key not in d:
return default
@@ -39,7 +42,7 @@ def _get(
def _get_required(
- d: Dict[str, Any], expected_type: Type[T], key: str, default: Optional[T] = None
+ d: dict[str, Any], expected_type: type[T], key: str, default: T | None = None
) -> T:
value = _get(d, expected_type, key, default)
if value is None:
@@ -47,7 +50,7 @@ def _get_required(
return value
-def _exactly_one_of(infos: Iterable[Optional["InfoType"]]) -> "InfoType":
+def _exactly_one_of(infos: Iterable[InfoType | None]) -> InfoType:
infos = [info for info in infos if info is not None]
if not infos:
raise DirectUrlValidationError(
@@ -61,7 +64,7 @@ def _exactly_one_of(infos: Iterable[Optional["InfoType"]]) -> "InfoType":
return infos[0]
-def _filter_none(**kwargs: Any) -> Dict[str, Any]:
+def _filter_none(**kwargs: Any) -> dict[str, Any]:
"""Make dict excluding None values."""
return {k: v for k, v in kwargs.items() if v is not None}
@@ -72,10 +75,10 @@ class VcsInfo:
vcs: str
commit_id: str
- requested_revision: Optional[str] = None
+ requested_revision: str | None = None
@classmethod
- def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["VcsInfo"]:
+ def _from_dict(cls, d: dict[str, Any] | None) -> VcsInfo | None:
if d is None:
return None
return cls(
@@ -84,7 +87,7 @@ def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["VcsInfo"]:
requested_revision=_get(d, str, "requested_revision"),
)
- def _to_dict(self) -> Dict[str, Any]:
+ def _to_dict(self) -> dict[str, Any]:
return _filter_none(
vcs=self.vcs,
requested_revision=self.requested_revision,
@@ -97,19 +100,19 @@ class ArchiveInfo:
def __init__(
self,
- hash: Optional[str] = None,
- hashes: Optional[Dict[str, str]] = None,
+ hash: str | None = None,
+ hashes: dict[str, str] | None = None,
) -> 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]:
+ def hash(self) -> str | None:
return self._hash
@hash.setter
- def hash(self, value: Optional[str]) -> None:
+ def hash(self, value: str | None) -> 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 from hashes.
@@ -127,12 +130,12 @@ def hash(self, value: Optional[str]) -> None:
self._hash = value
@classmethod
- def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["ArchiveInfo"]:
+ def _from_dict(cls, d: dict[str, Any] | None) -> ArchiveInfo | None:
if d is None:
return None
return cls(hash=_get(d, str, "hash"), hashes=_get(d, dict, "hashes"))
- def _to_dict(self) -> Dict[str, Any]:
+ def _to_dict(self) -> dict[str, Any]:
return _filter_none(hash=self.hash, hashes=self.hashes)
@@ -143,12 +146,12 @@ class DirInfo:
editable: bool = False
@classmethod
- def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["DirInfo"]:
+ def _from_dict(cls, d: dict[str, Any] | None) -> DirInfo | None:
if d is None:
return None
return cls(editable=_get_required(d, bool, "editable", default=False))
- def _to_dict(self) -> Dict[str, Any]:
+ def _to_dict(self) -> dict[str, Any]:
return _filter_none(editable=self.editable or None)
@@ -159,7 +162,7 @@ def _to_dict(self) -> Dict[str, Any]:
class DirectUrl:
url: str
info: InfoType
- subdirectory: Optional[str] = None
+ subdirectory: str | None = None
def _remove_auth_from_netloc(self, netloc: str) -> str:
if "@" not in netloc:
@@ -192,7 +195,7 @@ def validate(self) -> None:
self.from_dict(self.to_dict())
@classmethod
- def from_dict(cls, d: Dict[str, Any]) -> "DirectUrl":
+ def from_dict(cls, d: dict[str, Any]) -> DirectUrl:
return DirectUrl(
url=_get_required(d, str, "url"),
subdirectory=_get(d, str, "subdirectory"),
@@ -205,7 +208,7 @@ def from_dict(cls, d: Dict[str, Any]) -> "DirectUrl":
),
)
- def to_dict(self) -> Dict[str, Any]:
+ def to_dict(self) -> dict[str, Any]:
res = _filter_none(
url=self.redacted_url,
subdirectory=self.subdirectory,
@@ -214,7 +217,7 @@ def to_dict(self) -> Dict[str, Any]:
return res
@classmethod
- def from_json(cls, s: str) -> "DirectUrl":
+ def from_json(cls, s: str) -> DirectUrl:
return cls.from_dict(json.loads(s))
def to_json(self) -> str:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/format_control.py b/addons/source-python/packages/site-packages/pip/_internal/models/format_control.py
index ccd11272c..9f07e3f34 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/format_control.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/format_control.py
@@ -1,4 +1,4 @@
-from typing import FrozenSet, Optional, Set
+from __future__ import annotations
from pip._vendor.packaging.utils import canonicalize_name
@@ -12,8 +12,8 @@ class FormatControl:
def __init__(
self,
- no_binary: Optional[Set[str]] = None,
- only_binary: Optional[Set[str]] = None,
+ no_binary: set[str] | None = None,
+ only_binary: set[str] | None = None,
) -> None:
if no_binary is None:
no_binary = set()
@@ -36,7 +36,7 @@ def __repr__(self) -> str:
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:
+ def handle_mutual_excludes(value: str, target: set[str], other: set[str]) -> None:
if value.startswith("-"):
raise CommandError(
"--no-binary / --only-binary option requires 1 argument."
@@ -58,7 +58,7 @@ def handle_mutual_excludes(value: str, target: Set[str], other: Set[str]) -> Non
other.discard(name)
target.add(name)
- def get_allowed_formats(self, canonical_name: str) -> FrozenSet[str]:
+ def get_allowed_formats(self, canonical_name: str) -> frozenset[str]:
result = {"binary", "source"}
if canonical_name in self.only_binary:
result.discard("source")
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/installation_report.py b/addons/source-python/packages/site-packages/pip/_internal/models/installation_report.py
index b9c6330df..3e8e9683b 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/installation_report.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/installation_report.py
@@ -1,4 +1,5 @@
-from typing import Any, Dict, Sequence
+from collections.abc import Sequence
+from typing import Any
from pip._vendor.packaging.markers import default_environment
@@ -11,7 +12,7 @@ def __init__(self, install_requirements: Sequence[InstallRequirement]):
self._install_requirements = install_requirements
@classmethod
- def _install_req_to_dict(cls, ireq: InstallRequirement) -> Dict[str, Any]:
+ 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.hashes may
@@ -39,7 +40,7 @@ def _install_req_to_dict(cls, ireq: InstallRequirement) -> Dict[str, Any]:
res["requested_extras"] = sorted(ireq.extras)
return res
- def to_dict(self) -> Dict[str, Any]:
+ def to_dict(self) -> dict[str, Any]:
return {
"version": "1",
"pip_version": __version__,
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/link.py b/addons/source-python/packages/site-packages/pip/_internal/models/link.py
index 27ad01609..200ec34c5 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/link.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/link.py
@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+import datetime
import functools
import itertools
import logging
@@ -5,20 +8,16 @@
import posixpath
import re
import urllib.parse
+import urllib.request
+from collections.abc import Mapping
from dataclasses import dataclass
from typing import (
- TYPE_CHECKING,
Any,
- Dict,
- List,
- Mapping,
NamedTuple,
- Optional,
- Tuple,
- Union,
)
-from pip._internal.utils.deprecation import deprecated
+from pip._internal.exceptions import InvalidEggFragment
+from pip._internal.utils.datetime import parse_iso_datetime
from pip._internal.utils.filetypes import WHEEL_EXTENSION
from pip._internal.utils.hashes import Hashes
from pip._internal.utils.misc import (
@@ -29,9 +28,6 @@
)
from pip._internal.utils.urls import path_to_url, url_to_path
-if TYPE_CHECKING:
- from pip._internal.index.collector import IndexContent
-
logger = logging.getLogger(__name__)
@@ -69,8 +65,8 @@ def __post_init__(self) -> None:
assert self.name in _SUPPORTED_HASHES
@classmethod
- @functools.lru_cache(maxsize=None)
- def find_hash_url_fragment(cls, url: str) -> Optional["LinkHash"]:
+ @functools.cache
+ def find_hash_url_fragment(cls, url: str) -> LinkHash | None:
"""Search a string for a checksum algorithm name and encoded output value."""
match = cls._hash_url_fragment_re.search(url)
if match is None:
@@ -78,14 +74,14 @@ def find_hash_url_fragment(cls, url: str) -> Optional["LinkHash"]:
name, value = match.groups()
return cls(name=name, value=value)
- def as_dict(self) -> Dict[str, str]:
+ def as_dict(self) -> dict[str, str]:
return {self.name: self.value}
def as_hashes(self) -> Hashes:
"""Return a Hashes instance which checks only for the current hash."""
return Hashes({self.name: [self.value]})
- def is_hash_allowed(self, hashes: Optional[Hashes]) -> bool:
+ def is_hash_allowed(self, hashes: Hashes | None) -> bool:
"""
Return True if the current hash is allowed by `hashes`.
"""
@@ -98,14 +94,14 @@ def is_hash_allowed(self, hashes: Optional[Hashes]) -> bool:
class MetadataFile:
"""Information about a core metadata file associated with a distribution."""
- hashes: Optional[Dict[str, str]]
+ hashes: dict[str, str] | None
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]]:
+def supported_hashes(hashes: dict[str, str] | None) -> dict[str, str] | None:
# Remove any unsupported hash types from the mapping. If this leaves no
# supported hashes, return None
if hashes is None:
@@ -134,7 +130,11 @@ def _clean_file_url_path(part: str) -> str:
# should not be quoted. On Linux where drive letters do not
# exist, the colon should be quoted. We rely on urllib.request
# to do the right thing here.
- return urllib.request.pathname2url(urllib.request.url2pathname(part))
+ ret = urllib.request.pathname2url(urllib.request.url2pathname(part))
+ if ret.startswith("///"):
+ # Remove any URL authority section, leaving only the URL path.
+ ret = ret.removeprefix("//")
+ return ret
# percent-encoded: /
@@ -175,7 +175,11 @@ def _ensure_quoted_url(url: str) -> str:
# 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.urlunsplit(result._replace(path=path))
+ # Temporarily replace scheme with file to ensure the URL generated by
+ # urlunsplit() contains an empty netloc (file://) as per RFC 1738.
+ ret = urllib.parse.urlunsplit(result._replace(scheme="file", path=path))
+ ret = result.scheme + ret[4:] # Restore original scheme.
+ return ret
def _absolute_link_url(base_url: str, url: str) -> str:
@@ -202,6 +206,7 @@ class Link:
"requires_python",
"yanked_reason",
"metadata_file_data",
+ "upload_time",
"cache_link_parsing",
"egg_fragment",
]
@@ -209,17 +214,17 @@ class Link:
def __init__(
self,
url: str,
- comes_from: Optional[Union[str, "IndexContent"]] = None,
- requires_python: Optional[str] = None,
- yanked_reason: Optional[str] = None,
- metadata_file_data: Optional[MetadataFile] = None,
+ comes_from: str | None = None,
+ requires_python: str | None = None,
+ yanked_reason: str | None = None,
+ metadata_file_data: MetadataFile | None = None,
+ upload_time: datetime.datetime | None = None,
cache_link_parsing: bool = True,
- hashes: Optional[Mapping[str, str]] = None,
+ hashes: Mapping[str, str] | None = None,
) -> None:
"""
:param url: url of the resource pointed to (href of the link)
- :param comes_from: instance of IndexContent where the link was found,
- or string.
+ :param comes_from: URL or string indicating where the link was found.
:param requires_python: String containing the `Requires-Python`
metadata field, specified in PEP 345. This may be specified by
a data-requires-python attribute in the HTML link tag, as
@@ -234,6 +239,8 @@ def __init__(
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 upload_time: upload time of the file, or None if the information
+ is not available from the server.
: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.
@@ -267,6 +274,7 @@ def __init__(
self.requires_python = requires_python if requires_python else None
self.yanked_reason = yanked_reason
self.metadata_file_data = metadata_file_data
+ self.upload_time = upload_time
self.cache_link_parsing = cache_link_parsing
self.egg_fragment = self._egg_fragment()
@@ -274,9 +282,9 @@ def __init__(
@classmethod
def from_json(
cls,
- file_data: Dict[str, Any],
+ file_data: dict[str, Any],
page_url: str,
- ) -> Optional["Link"]:
+ ) -> Link | None:
"""
Convert an pypi json document from a simple repository page into a Link.
"""
@@ -295,6 +303,11 @@ def from_json(
if metadata_info is None:
metadata_info = file_data.get("dist-info-metadata")
+ if upload_time_data := file_data.get("upload-time"):
+ upload_time = parse_iso_datetime(upload_time_data)
+ else:
+ upload_time = None
+
# 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
@@ -320,15 +333,16 @@ def from_json(
yanked_reason=yanked_reason,
hashes=hashes,
metadata_file_data=metadata_file_data,
+ upload_time=upload_time,
)
@classmethod
def from_element(
cls,
- anchor_attribs: Dict[str, Optional[str]],
+ anchor_attribs: dict[str, str | None],
page_url: str,
base_url: str,
- ) -> Optional["Link"]:
+ ) -> Link | None:
"""
Convert an anchor element's attributes in a simple repository page to a Link.
"""
@@ -380,9 +394,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 +418,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("/")
@@ -437,7 +455,7 @@ def netloc(self) -> str:
def path(self) -> str:
return self._path
- def splitext(self) -> Tuple[str, str]:
+ def splitext(self) -> tuple[str, str]:
return splitext(posixpath.basename(self.path.rstrip("/")))
@property
@@ -456,7 +474,7 @@ def url_without_fragment(self) -> str:
r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.IGNORECASE
)
- def _egg_fragment(self) -> Optional[str]:
+ def _egg_fragment(self) -> str | None:
match = self._egg_fragment_re.search(self._url)
if not match:
return None
@@ -465,25 +483,20 @@ def _egg_fragment(self) -> Optional[str]:
# an optional extras specifier. Anything else is invalid.
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.",
- replacement="to use the req @ url syntax, and remove the egg fragment",
- gone_in="25.1",
- issue=13157,
- )
+ raise InvalidEggFragment(self, project_name)
return project_name
_subdirectory_fragment_re = re.compile(r"[#&]subdirectory=([^&]*)")
@property
- def subdirectory_fragment(self) -> Optional[str]:
+ def subdirectory_fragment(self) -> str | None:
match = self._subdirectory_fragment_re.search(self._url)
if not match:
return None
return match.group(1)
- def metadata_link(self) -> Optional["Link"]:
+ def metadata_link(self) -> Link | None:
"""Return a link to the associated core metadata file (if any)."""
if self.metadata_file_data is None:
return None
@@ -496,11 +509,11 @@ def as_hashes(self) -> Hashes:
return Hashes({k: [v] for k, v in self._hashes.items()})
@property
- def hash(self) -> Optional[str]:
+ def hash(self) -> str | None:
return next(iter(self._hashes.values()), None)
@property
- def hash_name(self) -> Optional[str]:
+ def hash_name(self) -> str | None:
return next(iter(self._hashes), None)
@property
@@ -532,7 +545,7 @@ def is_yanked(self) -> bool:
def has_hash(self) -> bool:
return bool(self._hashes)
- def is_hash_allowed(self, hashes: Optional[Hashes]) -> bool:
+ def is_hash_allowed(self, hashes: Hashes | None) -> bool:
"""
Return True if the link has a hash and it is allowed by `hashes`.
"""
@@ -568,9 +581,9 @@ class _CleanResult(NamedTuple):
"""
parsed: urllib.parse.SplitResult
- query: Dict[str, List[str]]
+ query: dict[str, list[str]]
subdirectory: str
- hashes: Dict[str, str]
+ hashes: dict[str, str]
def _clean_link(link: Link) -> _CleanResult:
@@ -599,6 +612,6 @@ def _clean_link(link: Link) -> _CleanResult:
)
-@functools.lru_cache(maxsize=None)
+@functools.cache
def links_equivalent(link1: Link, link2: Link) -> bool:
return _clean_link(link1) == _clean_link(link2)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/release_control.py b/addons/source-python/packages/site-packages/pip/_internal/models/release_control.py
new file mode 100644
index 000000000..f1de06863
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/release_control.py
@@ -0,0 +1,92 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+
+from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
+
+from pip._internal.exceptions import CommandError
+
+
+# TODO: add slots=True when Python 3.9 is dropped
+@dataclass
+class ReleaseControl:
+ """Helper for managing which release types can be installed."""
+
+ all_releases: set[str] = field(default_factory=set)
+ only_final: set[str] = field(default_factory=set)
+ _order: list[tuple[str, str]] = field(
+ init=False, default_factory=list, compare=False, repr=False
+ )
+
+ def handle_mutual_excludes(
+ self, value: str, target: set[str], other: set[str], attr_name: str
+ ) -> None:
+ """Parse and apply release control option value.
+
+ Processes comma-separated package names or special values `:all:` and `:none:`.
+
+ When adding packages to target, they're removed from other to maintain mutual
+ exclusivity between all_releases and only_final. All operations are tracked in
+ order so that the original command-line argument sequence can be reconstructed
+ when passing options to build subprocesses.
+ """
+ if value.startswith("-"):
+ raise CommandError(
+ "--all-releases / --only-final option requires 1 argument."
+ )
+ new = value.split(",")
+ while ":all:" in new:
+ other.clear()
+ target.clear()
+ target.add(":all:")
+ # Track :all: in order
+ self._order.append((attr_name, ":all:"))
+ del new[: new.index(":all:") + 1]
+ # Without a none, we want to discard everything as :all: covers it
+ if ":none:" not in new:
+ return
+ for name in new:
+ if name == ":none:":
+ target.clear()
+ # Track :none: in order
+ self._order.append((attr_name, ":none:"))
+ continue
+ name = canonicalize_name(name)
+ other.discard(name)
+ target.add(name)
+ # Track package-specific setting in order
+ self._order.append((attr_name, name))
+
+ def get_ordered_args(self) -> list[tuple[str, str]]:
+ """
+ Get ordered list of (flag_name, value) tuples for reconstructing CLI args.
+
+ Returns:
+ List of tuples where each tuple is (attribute_name, value).
+ The attribute_name is either 'all_releases' or 'only_final'.
+
+ Example:
+ [("all_releases", ":all:"), ("only_final", "simple")]
+ would be reconstructed as:
+ ["--all-releases", ":all:", "--only-final", "simple"]
+ """
+ return self._order[:]
+
+ def allows_prereleases(self, canonical_name: NormalizedName) -> bool | None:
+ """
+ Determine if pre-releases are allowed for a package.
+
+ Returns:
+ True: Pre-releases are allowed (package in all_releases)
+ False: Only final releases allowed (package in only_final)
+ None: No specific setting, use default behavior
+ """
+ if canonical_name in self.all_releases:
+ return True
+ elif canonical_name in self.only_final:
+ return False
+ elif ":all:" in self.all_releases:
+ return True
+ elif ":all:" in self.only_final:
+ return False
+ return None
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/search_scope.py b/addons/source-python/packages/site-packages/pip/_internal/models/search_scope.py
index ee7bc8622..136163ca0 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/search_scope.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/search_scope.py
@@ -4,7 +4,6 @@
import posixpath
import urllib.parse
from dataclasses import dataclass
-from typing import List
from pip._vendor.packaging.utils import canonicalize_name
@@ -23,15 +22,15 @@ class SearchScope:
__slots__ = ["find_links", "index_urls", "no_index"]
- find_links: List[str]
- index_urls: List[str]
+ find_links: list[str]
+ index_urls: list[str]
no_index: bool
@classmethod
def create(
cls,
- find_links: List[str],
- index_urls: List[str],
+ find_links: list[str],
+ index_urls: list[str],
no_index: bool,
) -> "SearchScope":
"""
@@ -42,7 +41,7 @@ def create(
# it and if it exists, use the normalized version.
# This is deliberately conservative - it might be fine just to
# blindly normalize anything starting with a ~...
- built_find_links: List[str] = []
+ built_find_links: list[str] = []
for link in find_links:
if link.startswith("~"):
new_link = normalize_path(link)
@@ -104,7 +103,7 @@ def get_formatted_locations(self) -> str:
)
return "\n".join(lines)
- def get_index_urls_locations(self, project_name: str) -> List[str]:
+ def get_index_urls_locations(self, project_name: str) -> list[str]:
"""Returns the locations found via self.index_urls
Checks the url_name on the main (first in the list) index and
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/selection_prefs.py b/addons/source-python/packages/site-packages/pip/_internal/models/selection_prefs.py
index e9b50aa51..04ef63ab5 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/selection_prefs.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/selection_prefs.py
@@ -1,6 +1,7 @@
-from typing import Optional
+from __future__ import annotations
from pip._internal.models.format_control import FormatControl
+from pip._internal.models.release_control import ReleaseControl
# TODO: This needs Python 3.10's improved slots support for dataclasses
@@ -13,7 +14,7 @@ class SelectionPreferences:
__slots__ = [
"allow_yanked",
- "allow_all_prereleases",
+ "release_control",
"format_control",
"prefer_binary",
"ignore_requires_python",
@@ -26,15 +27,17 @@ class SelectionPreferences:
def __init__(
self,
allow_yanked: bool,
- allow_all_prereleases: bool = False,
- format_control: Optional[FormatControl] = None,
+ release_control: ReleaseControl | None = None,
+ format_control: FormatControl | None = None,
prefer_binary: bool = False,
- ignore_requires_python: Optional[bool] = None,
+ ignore_requires_python: bool | None = None,
) -> None:
"""Create a SelectionPreferences object.
:param allow_yanked: Whether files marked as yanked (in the sense
of PEP 592) are permitted to be candidates for install.
+ :param release_control: A ReleaseControl object or None. Used to control
+ whether pre-releases are allowed for specific packages.
:param format_control: A FormatControl object or None. Used to control
the selection of source packages / binary packages when consulting
the index and links.
@@ -47,7 +50,7 @@ def __init__(
ignore_requires_python = False
self.allow_yanked = allow_yanked
- self.allow_all_prereleases = allow_all_prereleases
+ self.release_control = release_control
self.format_control = format_control
self.prefer_binary = prefer_binary
self.ignore_requires_python = ignore_requires_python
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/target_python.py b/addons/source-python/packages/site-packages/pip/_internal/models/target_python.py
index 88925a9fd..8c38392d8 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/target_python.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/target_python.py
@@ -1,5 +1,6 @@
+from __future__ import annotations
+
import sys
-from typing import List, Optional, Set, Tuple
from pip._vendor.packaging.tags import Tag
@@ -26,10 +27,10 @@ class TargetPython:
def __init__(
self,
- platforms: Optional[List[str]] = None,
- py_version_info: Optional[Tuple[int, ...]] = None,
- abis: Optional[List[str]] = None,
- implementation: Optional[str] = None,
+ platforms: list[str] | None = None,
+ py_version_info: tuple[int, ...] | None = None,
+ abis: list[str] | None = None,
+ implementation: str | None = None,
) -> None:
"""
:param platforms: A list of strings or None. If None, searches for
@@ -62,8 +63,8 @@ def __init__(
self.py_version_info = py_version_info
# 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
+ self._valid_tags: list[Tag] | None = None
+ self._valid_tags_set: set[Tag] | None = None
def format_given(self) -> str:
"""
@@ -85,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_sorted_tags(self) -> List[Tag]:
+ def get_sorted_tags(self) -> list[Tag]:
"""
Return the supported PEP 425 tags to check wheel candidates against.
@@ -110,7 +111,7 @@ def get_sorted_tags(self) -> List[Tag]:
return self._valid_tags
- def get_unsorted_tags(self) -> Set[Tag]:
+ def get_unsorted_tags(self) -> set[Tag]:
"""Exactly the same as get_sorted_tags, but returns a set.
This is important for performance.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/models/wheel.py b/addons/source-python/packages/site-packages/pip/_internal/models/wheel.py
index ea8560089..fbd4902dc 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/models/wheel.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/models/wheel.py
@@ -2,76 +2,38 @@
name that have meaning.
"""
-import re
-from typing import Dict, Iterable, List
+from __future__ import annotations
+
+from collections.abc import Iterable
from pip._vendor.packaging.tags import Tag
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
class Wheel:
"""A wheel file"""
- wheel_file_re = re.compile(
- r"""^(?P(?P[^\s-]+?)-(?P[^\s-]*?))
- ((-(?P\d[^-]*?))?-(?P[^\s-]+?)-(?P[^\s-]+?)-(?P[^\s-]+?)
- \.whl|\.dist-info)$""",
- re.VERBOSE,
- )
-
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
- }
-
- def get_formatted_file_tags(self) -> List[str]:
+
+ try:
+ wheel_info = parse_wheel_filename(filename)
+ except _PackagingInvalidWheelFilename as e:
+ raise InvalidWheelFilename(e.args[0]) from None
+
+ self.name, _version, self.build_tag, self.file_tags = wheel_info
+ self.version = str(_version)
+
+ 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)
- def support_index_min(self, tags: List[Tag]) -> int:
+ def support_index_min(self, tags: list[Tag]) -> int:
"""Return the lowest index that one of the wheel's file_tag combinations
achieves in the given list of supported tags.
@@ -90,7 +52,7 @@ def support_index_min(self, tags: List[Tag]) -> int:
raise ValueError()
def find_most_preferred_tag(
- self, tags: List[Tag], tag_to_priority: Dict[Tag, int]
+ self, tags: list[Tag], tag_to_priority: dict[Tag, int]
) -> int:
"""Return the priority of the most preferred tag that one of the wheel's file
tag combinations achieves in the given list of supported tags using the given
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/network/__init__.py
index b51bde91b..0ae1f5626 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/__init__.py
@@ -1,2 +1 @@
-"""Contains purely network-related utilities.
-"""
+"""Contains purely network-related utilities."""
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/auth.py b/addons/source-python/packages/site-packages/pip/_internal/network/auth.py
index 1a2606ed0..4504f61a7 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/auth.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/auth.py
@@ -4,6 +4,8 @@
providing credentials in the context of network requests.
"""
+from __future__ import annotations
+
import logging
import os
import shutil
@@ -12,13 +14,12 @@
import typing
import urllib.parse
from abc import ABC, abstractmethod
-from functools import lru_cache
+from functools import cache
from os.path import commonprefix
from pathlib import Path
-from typing import Any, Dict, List, NamedTuple, Optional, Tuple
+from typing import Any, NamedTuple
from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth
-from pip._vendor.requests.models import Request, Response
from pip._vendor.requests.utils import get_netrc_auth
from pip._internal.utils.logging import getLogger
@@ -31,6 +32,10 @@
)
from pip._internal.vcs.versioncontrol import AuthInfo
+if typing.TYPE_CHECKING:
+ from pip._vendor.requests import PreparedRequest
+ from pip._vendor.requests.models import Response
+
logger = getLogger(__name__)
KEYRING_DISABLED = False
@@ -48,9 +53,7 @@ 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: str | None) -> AuthInfo | None: ...
@abstractmethod
def save_auth_info(self, url: str, username: str, password: str) -> None: ...
@@ -61,7 +64,7 @@ class KeyRingNullProvider(KeyRingBaseProvider):
has_keyring = False
- def get_auth_info(self, url: str, username: Optional[str]) -> Optional[AuthInfo]:
+ def get_auth_info(self, url: str, username: str | None) -> AuthInfo | None:
return None
def save_auth_info(self, url: str, username: str, password: str) -> None:
@@ -78,7 +81,7 @@ def __init__(self) -> None:
self.keyring = keyring
- def get_auth_info(self, url: str, username: Optional[str]) -> Optional[AuthInfo]:
+ def get_auth_info(self, url: str, username: str | None) -> AuthInfo | None:
# Support keyring's get_credential interface which supports getting
# credentials without a username. This is only available for
# keyring>=15.2.0.
@@ -114,7 +117,7 @@ class KeyRingCliProvider(KeyRingBaseProvider):
def __init__(self, cmd: str) -> None:
self.keyring = cmd
- def get_auth_info(self, url: str, username: Optional[str]) -> Optional[AuthInfo]:
+ def get_auth_info(self, url: str, username: str | None) -> AuthInfo | None:
# This is the default implementation of keyring.get_credential
# https://github.com/jaraco/keyring/blob/97689324abcf01bd1793d49063e7ca01e03d7d07/keyring/backend.py#L134-L139
if username is not None:
@@ -126,7 +129,7 @@ def get_auth_info(self, url: str, username: Optional[str]) -> Optional[AuthInfo]
def save_auth_info(self, url: str, username: str, password: str) -> None:
return self._set_password(url, username, password)
- def _get_password(self, service_name: str, username: str) -> Optional[str]:
+ def _get_password(self, service_name: str, username: str) -> str | None:
"""Mirror the implementation of keyring.get_password using cli"""
if self.keyring is None:
return None
@@ -159,7 +162,7 @@ def _set_password(self, service_name: str, username: str, password: str) -> None
return None
-@lru_cache(maxsize=None)
+@cache
def get_keyring_provider(provider: str) -> KeyRingBaseProvider:
logger.verbose("Keyring provider requested: %s", provider)
@@ -225,19 +228,19 @@ class MultiDomainBasicAuth(AuthBase):
def __init__(
self,
prompting: bool = True,
- index_urls: Optional[List[str]] = None,
+ index_urls: list[str] | None = None,
keyring_provider: str = "auto",
) -> None:
self.prompting = prompting
self.index_urls = index_urls
- self.keyring_provider = keyring_provider # type: ignore[assignment]
- self.passwords: Dict[str, AuthInfo] = {}
+ self.keyring_provider = keyring_provider
+ self.passwords: dict[str, AuthInfo] = {}
# When the user is prompted to enter credentials and keyring is
# available, we will offer to save them. If the user accepts,
# this value is set to the credentials they entered. After the
# request authenticates, the caller should call
# ``save_credentials`` to save these.
- self._credentials_to_save: Optional[Credentials] = None
+ self._credentials_to_save: Credentials | None = None
@property
def keyring_provider(self) -> KeyRingBaseProvider:
@@ -260,9 +263,9 @@ def use_keyring(self) -> bool:
def _get_keyring_auth(
self,
- url: Optional[str],
- username: Optional[str],
- ) -> Optional[AuthInfo]:
+ url: str | None,
+ username: str | None,
+ ) -> AuthInfo | None:
"""Return the tuple auth for a given url from keyring."""
# Do nothing if no url was provided
if not url:
@@ -284,7 +287,7 @@ def _get_keyring_auth(
get_keyring_provider.cache_clear()
return None
- def _get_index_url(self, url: str) -> Optional[str]:
+ def _get_index_url(self, url: str) -> str | None:
"""Return the original index URL matching the requested URL.
Cached or dynamically generated credentials may work against
@@ -391,7 +394,7 @@ def _get_new_credentials(
def _get_url_and_credentials(
self, original_url: str
- ) -> Tuple[str, Optional[str], Optional[str]]:
+ ) -> tuple[str, str | None, str | None]:
"""Return the credentials to use for the provided URL.
If allowed, netrc and keyring may be used to obtain the
@@ -437,8 +440,9 @@ def _get_url_and_credentials(
return url, username, password
- def __call__(self, req: Request) -> Request:
+ def __call__(self, req: PreparedRequest) -> PreparedRequest:
# Get credentials for this request
+ assert req.url is not None
url, username, password = self._get_url_and_credentials(req.url)
# Set the url of the request to the url without any credentials
@@ -454,9 +458,7 @@ def __call__(self, req: Request) -> Request:
return req
# Factored out to allow for easy patching in tests
- def _prompt_for_password(
- self, netloc: str
- ) -> Tuple[Optional[str], Optional[str], bool]:
+ def _prompt_for_password(self, netloc: str) -> tuple[str | None, str | None, bool]:
username = ask_input(f"User for {netloc}: ") if self.prompting else None
if not username:
return None, None, False
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/cache.py b/addons/source-python/packages/site-packages/pip/_internal/network/cache.py
index fca04e694..2a372f2e0 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/cache.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/cache.py
@@ -1,16 +1,23 @@
-"""HTTP cache implementation.
-"""
+"""HTTP cache implementation."""
+
+from __future__ import annotations
import os
+import shutil
+from collections.abc import Generator
from contextlib import contextmanager
from datetime import datetime
-from typing import BinaryIO, Generator, Optional, Union
+from typing import Any, BinaryIO, Callable
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
+from pip._internal.utils.filesystem import (
+ adjacent_tmp_file,
+ copy_directory_permissions,
+ replace,
+)
from pip._internal.utils.misc import ensure_dir
@@ -60,7 +67,7 @@ def _get_cache_path(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:
# The cache entry is only valid if both metadata and body exist.
metadata_path = self._get_cache_path(key)
body_path = metadata_path + ".body"
@@ -70,29 +77,27 @@ def get(self, key: str) -> Optional[bytes]:
with open(metadata_path, "rb") as f:
return f.read()
- def _write(self, path: str, data: bytes) -> None:
+ def _write_to_file(self, path: str, writer_func: Callable[[BinaryIO], Any]) -> None:
+ """Common file writing logic with proper permissions and atomic replacement."""
with suppressed_cache_errors():
ensure_dir(os.path.dirname(path))
with adjacent_tmp_file(path) as f:
- f.write(data)
+ writer_func(f)
# 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)
+ copy_directory_permissions(self.directory, f)
replace(f.name, path)
+ def _write(self, path: str, data: bytes) -> None:
+ self._write_to_file(path, lambda f: f.write(data))
+
+ def _write_from_io(self, path: str, source_file: BinaryIO) -> None:
+ self._write_to_file(path, lambda f: shutil.copyfileobj(source_file, f))
+
def set(
- self, key: str, value: bytes, expires: Union[int, datetime, None] = None
+ self, key: str, value: bytes, expires: int | datetime | None = None
) -> None:
path = self._get_cache_path(key)
self._write(path, value)
@@ -104,7 +109,7 @@ def delete(self, key: str) -> None:
with suppressed_cache_errors():
os.remove(path + ".body")
- def get_body(self, key: str) -> Optional[BinaryIO]:
+ def get_body(self, key: str) -> BinaryIO | None:
# The cache entry is only valid if both metadata and body exist.
metadata_path = self._get_cache_path(key)
body_path = metadata_path + ".body"
@@ -116,3 +121,8 @@ def get_body(self, key: str) -> Optional[BinaryIO]:
def set_body(self, key: str, body: bytes) -> None:
path = self._get_cache_path(key) + ".body"
self._write(path, body)
+
+ def set_body_from_io(self, key: str, body_file: BinaryIO) -> None:
+ """Set the body of the cache entry from a file object."""
+ path = self._get_cache_path(key) + ".body"
+ self._write_from_io(path, body_file)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/download.py b/addons/source-python/packages/site-packages/pip/_internal/network/download.py
index 5c3bce3d2..26966423f 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/download.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/download.py
@@ -1,40 +1,56 @@
-"""Download files with progress indicators.
-"""
+"""Download files with progress indicators."""
+
+from __future__ import annotations
import email.message
import logging
import mimetypes
import os
-from typing import Iterable, Optional, Tuple
+from collections.abc import Iterable, Mapping
+from dataclasses import dataclass
+from http import HTTPStatus
+from typing import BinaryIO
+from pip._vendor.requests import PreparedRequest
from pip._vendor.requests.models import Response
+from pip._vendor.urllib3 import HTTPResponse as URLlib3Response
+from pip._vendor.urllib3._collections import HTTPHeaderDict
+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.cli.progress_bars import BarType, get_download_progress_renderer
+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
-from pip._internal.network.session import PipSession
+from pip._internal.network.cache import SafeFileCache, is_from_cache
+from pip._internal.network.session import CacheControlAdapter, PipSession
from pip._internal.network.utils import HEADERS, raise_for_status, response_chunks
from pip._internal.utils.misc import format_size, redact_auth_from_url, splitext
logger = logging.getLogger(__name__)
-def _get_http_response_size(resp: Response) -> Optional[int]:
+def _get_http_response_size(resp: Response) -> int | None:
try:
return int(resp.headers["content-length"])
except (ValueError, KeyError, TypeError):
return None
-def _prepare_download(
+def _get_http_response_etag_or_last_modified(resp: Response) -> str | None:
+ """
+ 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 _log_download(
resp: Response,
link: Link,
- progress_bar: str,
+ progress_bar: BarType,
+ total_length: int | None,
+ range_start: int | None = 0,
) -> Iterable[bytes]:
- total_length = _get_http_response_size(resp)
-
if link.netloc == PyPI.file_storage_domain:
url = link.show_url
else:
@@ -43,10 +59,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)
@@ -66,7 +89,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)
@@ -101,7 +126,7 @@ def _get_http_response_filename(resp: Response, link: Link) -> str:
content_disposition = resp.headers.get("content-disposition")
if content_disposition:
filename = parse_content_disposition(content_disposition, filename)
- ext: Optional[str] = splitext(filename)[1]
+ ext: str | None = splitext(filename)[1]
if not ext:
ext = mimetypes.guess_extension(resp.headers.get("content-type", ""))
if ext:
@@ -113,75 +138,204 @@ def _get_http_response_filename(resp: Response, link: Link) -> str:
return filename
-def _http_get_download(session: PipSession, link: Link) -> Response:
- target_url = link.url.split("#", 1)[0]
- resp = session.get(target_url, headers=HEADERS, stream=True)
- raise_for_status(resp)
- return resp
+@dataclass
+class _FileDownload:
+ """Stores the state of a single link download."""
+
+ link: Link
+ output_file: BinaryIO
+ size: int | None
+ bytes_received: int = 0
+ reattempts: int = 0
+
+ def is_incomplete(self) -> bool:
+ return bool(self.size is not None and self.bytes_received < self.size)
+
+ def write_chunk(self, data: bytes) -> None:
+ self.bytes_received += len(data)
+ self.output_file.write(data)
+
+ def reset_file(self) -> None:
+ """Delete any saved data and reset progress to zero."""
+ self.output_file.seek(0)
+ self.output_file.truncate()
+ self.bytes_received = 0
class Downloader:
def __init__(
self,
session: PipSession,
- progress_bar: str,
+ progress_bar: BarType,
) -> None:
self._session = session
self._progress_bar = progress_bar
+ self._resume_retries = session.resume_retries
+ assert (
+ self._resume_retries >= 0
+ ), "Number of max resume retries must be bigger or equal to zero"
- 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
+ def batch(
+ self, links: Iterable[Link], location: str
+ ) -> Iterable[tuple[Link, tuple[str, str]]]:
+ """Convenience method to download multiple links."""
+ for link in links:
+ filepath, content_type = self(link, location)
+ yield link, (filepath, content_type)
- filename = _get_http_response_filename(resp, link)
- filepath = os.path.join(location, filename)
+ def __call__(self, link: Link, location: str) -> tuple[str, str]:
+ """Download a link and save it under location."""
+ resp = self._http_get(link)
+ download_size = _get_http_response_size(resp)
- chunks = _prepare_download(resp, link, self._progress_bar)
+ filepath = os.path.join(location, _get_http_response_filename(resp, link))
with open(filepath, "wb") as content_file:
- for chunk in chunks:
- content_file.write(chunk)
+ download = _FileDownload(link, content_file, download_size)
+ self._process_response(download, resp)
+ if download.is_incomplete():
+ self._attempt_resumes_or_redownloads(download, resp)
+
content_type = resp.headers.get("Content-Type", "")
return filepath, content_type
+ def _process_response(self, download: _FileDownload, resp: Response) -> None:
+ """Download and save chunks from a response."""
+ chunks = _log_download(
+ resp,
+ download.link,
+ self._progress_bar,
+ download.size,
+ range_start=download.bytes_received,
+ )
+ try:
+ for chunk in chunks:
+ download.write_chunk(chunk)
+ except ReadTimeoutError as e:
+ # If the download size is not known, then give up downloading the file.
+ if download.size is None:
+ raise e
-class BatchDownloader:
- def __init__(
- self,
- session: PipSession,
- progress_bar: str,
+ logger.warning("Connection timed out while downloading.")
+
+ def _attempt_resumes_or_redownloads(
+ self, download: _FileDownload, first_resp: Response
) -> None:
- self._session = session
- self._progress_bar = progress_bar
+ """Attempt to resume/restart the download if connection was dropped."""
+
+ while download.reattempts < self._resume_retries and download.is_incomplete():
+ assert download.size is not None
+ download.reattempts += 1
+ logger.warning(
+ "Attempting to resume incomplete download (%s/%s, attempt %d)",
+ format_size(download.bytes_received),
+ format_size(download.size),
+ download.reattempts,
+ )
- 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", "")
- yield link, (filepath, content_type)
+ resume_resp = self._http_get_resume(download, should_match=first_resp)
+ # 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:
+ download.reset_file()
+ download.size = _get_http_response_size(resume_resp)
+ first_resp = resume_resp
+
+ self._process_response(download, resume_resp)
+ except (ConnectionError, ReadTimeoutError, OSError):
+ continue
+
+ # No more resume attempts. Raise an error if the download is still incomplete.
+ if download.is_incomplete():
+ os.remove(download.output_file.name)
+ raise IncompleteDownloadError(download)
+
+ # If we successfully completed the download via resume, manually cache it
+ # as a complete response to enable future caching
+ if download.reattempts > 0:
+ self._cache_resumed_download(download, first_resp)
+
+ def _cache_resumed_download(
+ self, download: _FileDownload, original_response: Response
+ ) -> None:
+ """
+ Manually cache a file that was successfully downloaded via resume retries.
+
+ cachecontrol doesn't cache 206 (Partial Content) responses, since they
+ are not complete files. This method manually adds the final file to the
+ cache as though it was downloaded in a single request, so that future
+ requests can use the cache.
+ """
+ url = download.link.url_without_fragment
+ adapter = self._session.get_adapter(url)
+
+ # Check if the adapter is the CacheControlAdapter (i.e. caching is enabled)
+ if not isinstance(adapter, CacheControlAdapter):
+ logger.debug(
+ "Skipping resume download caching: no cache controller for %s", url
+ )
+ return
+
+ # Check SafeFileCache is being used
+ assert isinstance(
+ adapter.cache, SafeFileCache
+ ), "separate body cache not in use!"
+
+ synthetic_request = PreparedRequest()
+ synthetic_request.prepare(method="GET", url=url, headers={})
+
+ synthetic_response_headers = HTTPHeaderDict()
+ for key, value in original_response.headers.items():
+ if key.lower() not in ["content-range", "content-length"]:
+ synthetic_response_headers[key] = value
+ synthetic_response_headers["content-length"] = str(download.size)
+
+ synthetic_response = URLlib3Response(
+ body="",
+ headers=synthetic_response_headers,
+ status=200,
+ preload_content=False,
+ )
+
+ # Save metadata and then stream the file contents to cache.
+ cache_url = adapter.controller.cache_url(url)
+ metadata_blob = adapter.controller.serializer.dumps(
+ synthetic_request, synthetic_response, b""
+ )
+ adapter.cache.set(cache_url, metadata_blob)
+ download.output_file.flush()
+ with open(download.output_file.name, "rb") as f:
+ adapter.cache.set_body_from_io(cache_url, f)
+
+ logger.debug(
+ "Cached resumed download as complete response for future use: %s", url
+ )
+
+ def _http_get_resume(
+ self, download: _FileDownload, should_match: Response
+ ) -> Response:
+ """Issue a HTTP range request to resume the download."""
+ # To better understand the download resumption logic, see the mdn web docs:
+ # https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/Range_requests
+ headers = HEADERS.copy()
+ headers["Range"] = f"bytes={download.bytes_received}-"
+ # If possible, use a conditional range request to avoid corrupted
+ # downloads caused by the remote file changing in-between.
+ if identifier := _get_http_response_etag_or_last_modified(should_match):
+ headers["If-Range"] = identifier
+ return self._http_get(download.link, headers)
+
+ def _http_get(self, link: Link, headers: Mapping[str, str] = HEADERS) -> Response:
+ target_url = link.url_without_fragment
+ try:
+ resp = self._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
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/lazy_wheel.py b/addons/source-python/packages/site-packages/pip/_internal/network/lazy_wheel.py
index 03f883c1f..00398337e 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/lazy_wheel.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/lazy_wheel.py
@@ -1,14 +1,17 @@
"""Lazy ZIP over HTTP"""
+from __future__ import annotations
+
__all__ = ["HTTPRangeRequestUnsupported", "dist_from_wheel_url"]
from bisect import bisect_left, bisect_right
+from collections.abc import Generator
from contextlib import contextmanager
from tempfile import NamedTemporaryFile
-from typing import Any, Dict, Generator, List, Optional, Tuple
+from typing import Any
from zipfile import BadZipFile, ZipFile
-from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.packaging.utils import NormalizedName
from pip._vendor.requests.models import CONTENT_CHUNK_SIZE, Response
from pip._internal.metadata import BaseDistribution, MemoryWheel, get_wheel_distribution
@@ -20,7 +23,9 @@ class HTTPRangeRequestUnsupported(Exception):
pass
-def dist_from_wheel_url(name: str, url: str, session: PipSession) -> BaseDistribution:
+def dist_from_wheel_url(
+ name: NormalizedName, url: str, session: PipSession
+) -> BaseDistribution:
"""Return a distribution object from the given wheel URL.
This uses HTTP range requests to only fetch the portion of the wheel
@@ -34,7 +39,7 @@ def dist_from_wheel_url(name: str, url: str, session: PipSession) -> BaseDistrib
wheel = MemoryWheel(zf.name, zf) # type: ignore
# After context manager exit, wheel.name
# is an invalid file by intention.
- return get_wheel_distribution(wheel, canonicalize_name(name))
+ return get_wheel_distribution(wheel, name)
class LazyZipOverHTTP:
@@ -56,8 +61,8 @@ def __init__(
self._length = int(head.headers["Content-Length"])
self._file = NamedTemporaryFile()
self.truncate(self._length)
- self._left: List[int] = []
- self._right: List[int] = []
+ self._left: list[int] = []
+ self._right: list[int] = []
if "bytes" not in head.headers.get("Accept-Ranges", "none"):
raise HTTPRangeRequestUnsupported("range request is not supported")
self._check_zip()
@@ -117,7 +122,7 @@ def tell(self) -> int:
"""Return the current position."""
return self._file.tell()
- def truncate(self, size: Optional[int] = None) -> int:
+ def truncate(self, size: int | None = None) -> int:
"""Resize the stream to the given size in bytes.
If size is unspecified resize to the current position.
@@ -131,7 +136,7 @@ def writable(self) -> bool:
"""Return False."""
return False
- def __enter__(self) -> "LazyZipOverHTTP":
+ def __enter__(self) -> LazyZipOverHTTP:
self._file.__enter__()
return self
@@ -166,7 +171,7 @@ def _check_zip(self) -> None:
break
def _stream_response(
- self, start: int, end: int, base_headers: Dict[str, str] = HEADERS
+ self, start: int, end: int, base_headers: dict[str, str] = HEADERS
) -> Response:
"""Return HTTP response to a range request from start to end."""
headers = base_headers.copy()
@@ -177,7 +182,7 @@ def _stream_response(
def _merge(
self, start: int, end: int, left: int, right: int
- ) -> Generator[Tuple[int, int], None, None]:
+ ) -> Generator[tuple[int, int], None, None]:
"""Return a generator of intervals to be fetched.
Args:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/session.py b/addons/source-python/packages/site-packages/pip/_internal/network/session.py
index 5e10f8f56..34083e089 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/session.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/session.py
@@ -2,6 +2,8 @@
network request configuration and behavior.
"""
+from __future__ import annotations
+
import email.utils
import functools
import io
@@ -16,16 +18,11 @@
import sys
import urllib.parse
import warnings
+from collections.abc import Generator, Mapping, Sequence
from typing import (
TYPE_CHECKING,
Any,
- Dict,
- Generator,
- List,
- Mapping,
Optional,
- Sequence,
- Tuple,
Union,
)
@@ -53,19 +50,20 @@
if TYPE_CHECKING:
from ssl import SSLContext
+ from pip._vendor.urllib3 import ProxyManager
from pip._vendor.urllib3.poolmanager import PoolManager
logger = logging.getLogger(__name__)
-SecureOrigin = Tuple[str, str, Optional[Union[int, str]]]
+SecureOrigin = tuple[str, str, Optional[Union[int, str]]]
# Ignore warning raised when using --trusted-host.
warnings.filterwarnings("ignore", category=InsecureRequestWarning)
-SECURE_ORIGINS: List[SecureOrigin] = [
+SECURE_ORIGINS: list[SecureOrigin] = [
# protocol, hostname, port
# Taken from Chrome's list of secure origins (See: http://bit.ly/1qrySKC)
("https", "*", "*"),
@@ -112,7 +110,7 @@ def user_agent() -> str:
"""
Return a string representing the user agent.
"""
- data: Dict[str, Any] = {
+ data: dict[str, Any] = {
"installer": {"name": "pip", "version": __version__},
"python": platform.python_version(),
"implementation": {
@@ -140,7 +138,7 @@ def user_agent() -> str:
from pip._vendor import distro
linux_distribution = distro.name(), distro.version(), distro.codename()
- distro_infos: Dict[str, Any] = dict(
+ distro_infos: dict[str, Any] = dict(
filter(
lambda x: x[1],
zip(["name", "version", "id"], linux_distribution),
@@ -214,11 +212,12 @@ def send(
self,
request: PreparedRequest,
stream: bool = False,
- timeout: Optional[Union[float, Tuple[float, float]]] = None,
- verify: Union[bool, str] = True,
- cert: Optional[Union[str, Tuple[str, str]]] = None,
- proxies: Optional[Mapping[str, str]] = None,
+ timeout: float | tuple[float, float] | tuple[float, None] | None = None,
+ verify: bool | str = True,
+ cert: bytes | str | tuple[bytes | str, bytes | str] | None = None,
+ proxies: Mapping[str, str] | None = None,
) -> Response:
+ assert request.url is not None
pathname = url_to_path(request.url)
resp = Response()
@@ -239,13 +238,13 @@ def send(
resp.headers = CaseInsensitiveDict(
{
"Content-Type": content_type,
- "Content-Length": stats.st_size,
+ "Content-Length": str(stats.st_size),
"Last-Modified": modified,
}
)
resp.raw = open(pathname, "rb")
- resp.close = resp.raw.close
+ resp.close = resp.raw.close # type: ignore[method-assign]
return resp
@@ -264,7 +263,7 @@ class _SSLContextAdapterMixin:
def __init__(
self,
*,
- ssl_context: Optional["SSLContext"] = None,
+ ssl_context: SSLContext | None = None,
**kwargs: Any,
) -> None:
self._ssl_context = ssl_context
@@ -276,16 +275,23 @@ def init_poolmanager(
maxsize: int,
block: bool = DEFAULT_POOLBLOCK,
**pool_kwargs: Any,
- ) -> "PoolManager":
+ ) -> PoolManager:
if self._ssl_context is not None:
pool_kwargs.setdefault("ssl_context", self._ssl_context)
- return super().init_poolmanager( # type: ignore[misc]
+ return super().init_poolmanager( # type: ignore[misc, no-any-return]
connections=connections,
maxsize=maxsize,
block=block,
**pool_kwargs,
)
+ def proxy_manager_for(self, proxy: str, **proxy_kwargs: Any) -> ProxyManager:
+ # Proxy manager replaces the pool manager, so inject our SSL
+ # context here too. https://github.com/pypa/pip/issues/13288
+ if self._ssl_context is not None:
+ proxy_kwargs.setdefault("ssl_context", self._ssl_context)
+ return super().proxy_manager_for(proxy, **proxy_kwargs) # type: ignore[misc, no-any-return]
+
class HTTPAdapter(_SSLContextAdapterMixin, _BaseHTTPAdapter):
pass
@@ -300,8 +306,8 @@ def cert_verify(
self,
conn: ConnectionPool,
url: str,
- verify: Union[bool, str],
- cert: Optional[Union[str, Tuple[str, str]]],
+ verify: bool | str,
+ cert: str | tuple[str, str] | None,
) -> None:
super().cert_verify(conn=conn, url=url, verify=False, cert=cert)
@@ -311,23 +317,24 @@ def cert_verify(
self,
conn: ConnectionPool,
url: str,
- verify: Union[bool, str],
- cert: Optional[Union[str, Tuple[str, str]]],
+ verify: bool | str,
+ cert: str | tuple[str, str] | None,
) -> None:
super().cert_verify(conn=conn, url=url, verify=False, cert=cert)
class PipSession(requests.Session):
- timeout: Optional[int] = None
+ timeout: int | None = None
def __init__(
self,
*args: Any,
retries: int = 0,
- cache: Optional[str] = None,
+ resume_retries: int = 0,
+ cache: str | None = None,
trusted_hosts: Sequence[str] = (),
- index_urls: Optional[List[str]] = None,
- ssl_context: Optional["SSLContext"] = None,
+ index_urls: list[str] | None = None,
+ ssl_context: SSLContext | None = None,
**kwargs: Any,
) -> None:
"""
@@ -338,14 +345,14 @@ 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_trusted_origins: list[tuple[str, int | None]] = []
self.pip_proxy = None
# Attach our User Agent to the request
self.headers["User-Agent"] = user_agent()
# Attach our Authentication handler to the session
- self.auth = MultiDomainBasicAuth(index_urls=index_urls)
+ self.auth: MultiDomainBasicAuth = MultiDomainBasicAuth(index_urls=index_urls)
# Create our urllib3.Retry instance which will allow us to customize
# how we handle retries.
@@ -365,6 +372,7 @@ def __init__(
# order to prevent hammering the service.
backoff_factor=0.25,
) # type: ignore
+ self.resume_retries = resume_retries
# Our Insecure HTTPAdapter disables HTTPS validation. It does not
# support caching so we'll use it for all http:// URLs.
@@ -378,8 +386,9 @@ def __init__(
# we can't validate the response of an insecurely/untrusted fetched
# origin, and we don't want someone to be able to poison the cache and
# require manual eviction from the cache to fix it.
+ self._trusted_host_adapter: InsecureCacheControlAdapter | InsecureHTTPAdapter
if cache:
- secure_adapter = CacheControlAdapter(
+ secure_adapter: _BaseHTTPAdapter = CacheControlAdapter(
cache=SafeFileCache(cache),
max_retries=retries,
ssl_context=ssl_context,
@@ -401,7 +410,7 @@ def __init__(
for host in trusted_hosts:
self.add_trusted_host(host, suppress_logging=True)
- def update_index_urls(self, new_index_urls: List[str]) -> None:
+ def update_index_urls(self, new_index_urls: list[str]) -> None:
"""
:param new_index_urls: New index urls to update the authentication
handler with.
@@ -409,7 +418,7 @@ def update_index_urls(self, new_index_urls: List[str]) -> None:
self.auth.index_urls = new_index_urls
def add_trusted_host(
- self, host: str, source: Optional[str] = None, suppress_logging: bool = False
+ self, host: str, source: str | None = None, suppress_logging: bool = False
) -> None:
"""
:param host: It is okay to provide a host that has previously been
@@ -513,7 +522,7 @@ def is_secure_origin(self, location: Link) -> bool:
return False
- def request(self, method: str, url: str, *args: Any, **kwargs: Any) -> Response:
+ def request(self, method: str, url: str, *args: Any, **kwargs: Any) -> Response: # type: ignore[override]
# Allow setting a default timeout on a session
kwargs.setdefault("timeout", self.timeout)
# Allow setting a default proxies on a session
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/utils.py b/addons/source-python/packages/site-packages/pip/_internal/network/utils.py
index bba4c265e..74d3111cf 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/utils.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/utils.py
@@ -1,4 +1,4 @@
-from typing import Dict, Generator
+from collections.abc import Generator
from pip._vendor.requests.models import Response
@@ -23,7 +23,7 @@
# you're not asking for a compressed file and will then decompress it
# before sending because if that's the case I don't think it'll ever be
# possible to make this work.
-HEADERS: Dict[str, str] = {"Accept-Encoding": "identity"}
+HEADERS: dict[str, str] = {"Accept-Encoding": "identity"}
DOWNLOAD_CHUNK_SIZE = 256 * 1024
diff --git a/addons/source-python/packages/site-packages/pip/_internal/network/xmlrpc.py b/addons/source-python/packages/site-packages/pip/_internal/network/xmlrpc.py
index 22ec8d2f4..f4bddb48a 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/network/xmlrpc.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/network/xmlrpc.py
@@ -1,10 +1,9 @@
-"""xmlrpclib.Transport implementation
-"""
+"""xmlrpclib.Transport implementation"""
import logging
import urllib.parse
import xmlrpc.client
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING
from pip._internal.exceptions import NetworkConnectionError
from pip._internal.network.session import PipSession
@@ -37,7 +36,7 @@ def request(
handler: str,
request_body: "SizedBuffer",
verbose: bool = False,
- ) -> Tuple["_Marshallable", ...]:
+ ) -> tuple["_Marshallable", ...]:
assert isinstance(host, str)
parts = (self._scheme, host, handler, None, None, None)
url = urllib.parse.urlunparse(parts)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/build/build_tracker.py b/addons/source-python/packages/site-packages/pip/_internal/operations/build/build_tracker.py
index 0ed8dd235..cbb4e4f09 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/build/build_tracker.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/build/build_tracker.py
@@ -1,9 +1,11 @@
+from __future__ import annotations
+
import contextlib
import hashlib
import logging
import os
+from collections.abc import Generator
from types import TracebackType
-from typing import Dict, Generator, Optional, Type, Union
from pip._internal.req.req_install import InstallRequirement
from pip._internal.utils.temp_dir import TempDirectory
@@ -17,7 +19,7 @@ def update_env_context_manager(**changes: str) -> Generator[None, None, None]:
# Save values from the target and change them.
non_existent_marker = object()
- saved_values: Dict[str, Union[object, str]] = {}
+ saved_values: dict[str, object | str] = {}
for name, new_value in changes.items():
try:
saved_values[name] = target[name]
@@ -38,7 +40,7 @@ def update_env_context_manager(**changes: str) -> Generator[None, None, None]:
@contextlib.contextmanager
-def get_build_tracker() -> Generator["BuildTracker", None, None]:
+def get_build_tracker() -> Generator[BuildTracker, None, None]:
root = os.environ.get("PIP_BUILD_TRACKER")
with contextlib.ExitStack() as ctx:
if root is None:
@@ -65,18 +67,18 @@ class BuildTracker:
def __init__(self, root: str) -> None:
self._root = root
- self._entries: Dict[TrackerId, InstallRequirement] = {}
+ self._entries: dict[TrackerId, InstallRequirement] = {}
logger.debug("Created build tracker: %s", self._root)
- def __enter__(self) -> "BuildTracker":
+ def __enter__(self) -> BuildTracker:
logger.debug("Entered build tracker: %s", self._root)
return self
def __exit__(
self,
- exc_type: Optional[Type[BaseException]],
- exc_val: Optional[BaseException],
- exc_tb: Optional[TracebackType],
+ exc_type: type[BaseException] | None,
+ exc_val: BaseException | None,
+ exc_tb: TracebackType | None,
) -> None:
self.cleanup()
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/build/metadata.py b/addons/source-python/packages/site-packages/pip/_internal/operations/build/metadata.py
index c66ac354d..a546809ec 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/build/metadata.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_internal/operations/build/metadata_editable.py b/addons/source-python/packages/site-packages/pip/_internal/operations/build/metadata_editable.py
index 3397ccf0f..27ecd7d3d 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/build/metadata_editable.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel.py b/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel.py
index 064811ad1..8595e45c5 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel.py
@@ -1,6 +1,7 @@
+from __future__ import annotations
+
import logging
import os
-from typing import Optional
from pip._vendor.pyproject_hooks import BuildBackendHookCaller
@@ -13,25 +14,25 @@ def build_wheel_pep517(
name: str,
backend: BuildBackendHookCaller,
metadata_directory: str,
- tempd: str,
-) -> Optional[str]:
+ wheel_directory: str,
+) -> str | None:
"""Build one InstallRequirement using the PEP 517 build process.
Returns path to wheel if successfully built. Otherwise, returns None.
"""
assert metadata_directory is not None
try:
- logger.debug("Destination directory: %s", tempd)
+ logger.debug("Destination directory: %s", wheel_directory)
runner = runner_with_spinner_message(
f"Building wheel for {name} (pyproject.toml)"
)
with backend.subprocess_runner(runner):
wheel_name = backend.build_wheel(
- tempd,
+ wheel_directory=wheel_directory,
metadata_directory=metadata_directory,
)
except Exception:
logger.error("Failed building wheel for %s", name)
return None
- return os.path.join(tempd, wheel_name)
+ return os.path.join(wheel_directory, wheel_name)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel_editable.py b/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel_editable.py
index 719d69dd8..f00d9b27e 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel_editable.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/build/wheel_editable.py
@@ -1,6 +1,7 @@
+from __future__ import annotations
+
import logging
import os
-from typing import Optional
from pip._vendor.pyproject_hooks import BuildBackendHookCaller, HookMissing
@@ -13,15 +14,15 @@ def build_wheel_editable(
name: str,
backend: BuildBackendHookCaller,
metadata_directory: str,
- tempd: str,
-) -> Optional[str]:
+ wheel_directory: str,
+) -> str | None:
"""Build one InstallRequirement using the PEP 660 build process.
Returns path to wheel if successfully built. Otherwise, returns None.
"""
assert metadata_directory is not None
try:
- logger.debug("Destination directory: %s", tempd)
+ logger.debug("Destination directory: %s", wheel_directory)
runner = runner_with_spinner_message(
f"Building editable for {name} (pyproject.toml)"
@@ -29,7 +30,7 @@ def build_wheel_editable(
with backend.subprocess_runner(runner):
try:
wheel_name = backend.build_editable(
- tempd,
+ wheel_directory=wheel_directory,
metadata_directory=metadata_directory,
)
except HookMissing as e:
@@ -43,4 +44,4 @@ def build_wheel_editable(
except Exception:
logger.error("Failed building editable for %s", name)
return None
- return os.path.join(tempd, wheel_name)
+ return os.path.join(wheel_directory, wheel_name)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/check.py b/addons/source-python/packages/site-packages/pip/_internal/operations/check.py
index 4b6fbc4c3..2d71fa5ff 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/check.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/check.py
@@ -1,21 +1,15 @@
-"""Validation of dependencies of packages
-"""
+"""Validation of dependencies of packages"""
+
+from __future__ import annotations
import logging
+from collections.abc import Generator, Iterable
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
@@ -33,21 +27,21 @@
class PackageDetails(NamedTuple):
version: Version
- dependencies: List[Requirement]
+ dependencies: list[Requirement]
# Shorthands
-PackageSet = Dict[NormalizedName, PackageDetails]
-Missing = Tuple[NormalizedName, Requirement]
-Conflicting = Tuple[NormalizedName, Version, Requirement]
+PackageSet = dict[NormalizedName, PackageDetails]
+Missing = tuple[NormalizedName, Requirement]
+Conflicting = tuple[NormalizedName, Version, Requirement]
-MissingDict = Dict[NormalizedName, List[Missing]]
-ConflictingDict = Dict[NormalizedName, List[Conflicting]]
-CheckResult = Tuple[MissingDict, ConflictingDict]
-ConflictDetails = Tuple[PackageSet, CheckResult]
+MissingDict = dict[NormalizedName, list[Missing]]
+ConflictingDict = dict[NormalizedName, list[Conflicting]]
+CheckResult = tuple[MissingDict, ConflictingDict]
+ConflictDetails = tuple[PackageSet, CheckResult]
-def create_package_set_from_installed() -> Tuple[PackageSet, bool]:
+def create_package_set_from_installed() -> tuple[PackageSet, bool]:
"""Converts a list of distributions into a PackageSet."""
package_set = {}
problems = False
@@ -65,7 +59,7 @@ def create_package_set_from_installed() -> Tuple[PackageSet, bool]:
def check_package_set(
- package_set: PackageSet, should_ignore: Optional[Callable[[str], bool]] = None
+ package_set: PackageSet, should_ignore: Callable[[str], bool] | None = None
) -> CheckResult:
"""Check if a package set is consistent
@@ -78,8 +72,8 @@ def check_package_set(
for package_name, package_detail in package_set.items():
# Info about dependencies of package_name
- missing_deps: Set[Missing] = set()
- conflicting_deps: Set[Conflicting] = set()
+ missing_deps: set[Missing] = set()
+ conflicting_deps: set[Conflicting] = set()
if should_ignore and should_ignore(package_name):
continue
@@ -109,7 +103,7 @@ def check_package_set(
return missing, conflicting
-def check_install_conflicts(to_install: List[InstallRequirement]) -> ConflictDetails:
+def check_install_conflicts(to_install: list[InstallRequirement]) -> ConflictDetails:
"""For checking if the dependency graph would be consistent after \
installing given requirements
"""
@@ -136,7 +130,7 @@ def check_unsupported(
for p in packages:
with suppress(FileNotFoundError):
wheel_file = p.read_text("WHEEL")
- wheel_tags: FrozenSet[Tag] = reduce(
+ wheel_tags: frozenset[Tag] = reduce(
frozenset.union,
map(parse_tag, Parser().parsestr(wheel_file).get_all("Tag", [])),
frozenset(),
@@ -146,8 +140,8 @@ def check_unsupported(
def _simulate_installation_of(
- to_install: List[InstallRequirement], package_set: PackageSet
-) -> Set[NormalizedName]:
+ to_install: list[InstallRequirement], package_set: PackageSet
+) -> set[NormalizedName]:
"""Computes the version of packages after installing to_install."""
# Keep track of packages that were installed
installed = set()
@@ -165,8 +159,8 @@ def _simulate_installation_of(
def _create_whitelist(
- would_be_installed: Set[NormalizedName], package_set: PackageSet
-) -> Set[NormalizedName]:
+ would_be_installed: set[NormalizedName], package_set: PackageSet
+) -> set[NormalizedName]:
packages_affected = set(would_be_installed)
for package_name in package_set:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/freeze.py b/addons/source-python/packages/site-packages/pip/_internal/operations/freeze.py
index ae5dd37f9..486a83321 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/freeze.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/freeze.py
@@ -1,8 +1,11 @@
+from __future__ import annotations
+
import collections
import logging
import os
+from collections.abc import Container, Generator, Iterable
from dataclasses import dataclass, field
-from typing import Container, Dict, Generator, Iterable, List, NamedTuple, Optional, Set
+from typing import NamedTuple
from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
from pip._vendor.packaging.version import InvalidVersion
@@ -21,19 +24,19 @@
class _EditableInfo(NamedTuple):
requirement: str
- comments: List[str]
+ comments: list[str]
def freeze(
- requirement: Optional[List[str]] = None,
+ requirement: list[str] | None = None,
local_only: bool = False,
user_only: bool = False,
- paths: Optional[List[str]] = None,
+ paths: list[str] | None = None,
isolated: bool = False,
exclude_editable: bool = False,
skip: Container[str] = (),
) -> Generator[str, None, None]:
- installations: Dict[str, FrozenRequirement] = {}
+ installations: dict[str, FrozenRequirement] = {}
dists = get_environment(paths).iter_installed_distributions(
local_only=local_only,
@@ -51,10 +54,10 @@ def freeze(
# should only be emitted once, even if the same option is in multiple
# requirements files, so we need to keep track of what has been emitted
# so that we don't emit it again if it's seen again
- emitted_options: Set[str] = set()
+ emitted_options: set[str] = set()
# keep track of which files a requirement is in so that we can
# give an accurate warning if a requirement appears multiple times.
- req_files: Dict[str, List[str]] = collections.defaultdict(list)
+ req_files: dict[str, list[str]] = collections.defaultdict(list)
for req_file_path in requirement:
with open(req_file_path) as req_file:
for line in req_file:
@@ -83,7 +86,7 @@ def freeze(
yield line
continue
- if line.startswith("-e") or line.startswith("--editable"):
+ if line.startswith(("-e", "--editable")):
if line.startswith("-e"):
line = line[2:].strip()
else:
@@ -233,7 +236,7 @@ def canonical_name(self) -> NormalizedName:
return canonicalize_name(self.name)
@classmethod
- def from_dist(cls, dist: BaseDistribution) -> "FrozenRequirement":
+ def from_dist(cls, dist: BaseDistribution) -> FrozenRequirement:
editable = dist.editable
if editable:
req, comments = _get_editable_info(dist)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/install/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/operations/install/__init__.py
index 24d6a5dd3..2645a4aca 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/install/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/install/__init__.py
@@ -1,2 +1 @@
-"""For modules related to installing packages.
-"""
+"""For modules related to installing packages."""
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/install/wheel.py b/addons/source-python/packages/site-packages/pip/_internal/operations/install/wheel.py
index aef42aa9e..40097d6a7 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/install/wheel.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/install/wheel.py
@@ -1,5 +1,6 @@
-"""Support for installing and building the "wheel" binary package format.
-"""
+"""Support for installing and building the "wheel" binary package format."""
+
+from __future__ import annotations
import collections
import compileall
@@ -11,27 +12,19 @@
import re
import shutil
import sys
+import textwrap
import warnings
from base64 import urlsafe_b64encode
+from collections.abc import Generator, Iterable, Iterator, Sequence
from email.message import Message
from itertools import chain, filterfalse, starmap
from typing import (
IO,
- TYPE_CHECKING,
Any,
BinaryIO,
Callable,
- Dict,
- Generator,
- Iterable,
- Iterator,
- List,
NewType,
- Optional,
Protocol,
- Sequence,
- Set,
- Tuple,
Union,
cast,
)
@@ -60,31 +53,30 @@
)
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__)
RecordPath = NewType("RecordPath", str)
-InstalledCSVRow = Tuple[RecordPath, str, Union[int, str]]
+InstalledCSVRow = tuple[RecordPath, str, Union[int, str]]
-def rehash(path: str, blocksize: int = 1 << 20) -> Tuple[str, str]:
+def rehash(path: str, blocksize: int = 1 << 20) -> tuple[str, str]:
"""Return (encoded_digest, length) for path using hashlib.sha256()"""
h, length = hash_file(path, blocksize)
digest = "sha256=" + urlsafe_b64encode(h.digest()).decode("latin1").rstrip("=")
return (digest, str(length))
-def csv_io_kwargs(mode: str) -> Dict[str, Any]:
+def csv_io_kwargs(mode: str) -> dict[str, Any]:
"""Return keyword arguments to properly open a CSV file
in the given mode.
"""
@@ -115,7 +107,7 @@ def wheel_root_is_purelib(metadata: Message) -> bool:
return metadata.get("Root-Is-Purelib", "").lower() == "true"
-def get_entrypoints(dist: BaseDistribution) -> Tuple[Dict[str, str], Dict[str, str]]:
+def get_entrypoints(dist: BaseDistribution) -> tuple[dict[str, str], dict[str, str]]:
console_scripts = {}
gui_scripts = {}
for entry_point in dist.iter_entry_points():
@@ -126,7 +118,7 @@ def get_entrypoints(dist: BaseDistribution) -> Tuple[Dict[str, str], Dict[str, s
return console_scripts, gui_scripts
-def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> Optional[str]:
+def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> str | None:
"""Determine if any scripts are not on PATH and format a warning.
Returns a warning message if one or more scripts are not on PATH,
otherwise None.
@@ -135,7 +127,7 @@ def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> Optional[str]:
return None
# Group scripts by the path they were installed in
- grouped_by_dir: Dict[str, Set[str]] = collections.defaultdict(set)
+ grouped_by_dir: dict[str, set[str]] = collections.defaultdict(set)
for destfile in scripts:
parent_dir = os.path.dirname(destfile)
script_name = os.path.basename(destfile)
@@ -151,7 +143,7 @@ def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> Optional[str]:
not_warn_dirs.append(
os.path.normcase(os.path.normpath(os.path.dirname(sys.executable)))
)
- warn_for: Dict[str, Set[str]] = {
+ warn_for: dict[str, set[str]] = {
parent_dir: scripts
for parent_dir, scripts in grouped_by_dir.items()
if os.path.normcase(os.path.normpath(parent_dir)) not in not_warn_dirs
@@ -162,7 +154,7 @@ def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> Optional[str]:
# Format a message
msg_lines = []
for parent_dir, dir_scripts in warn_for.items():
- sorted_scripts: List[str] = sorted(dir_scripts)
+ sorted_scripts: list[str] = sorted(dir_scripts)
if len(sorted_scripts) == 1:
start_text = f"script {sorted_scripts[0]} is"
else:
@@ -200,7 +192,7 @@ def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> Optional[str]:
def _normalized_outrows(
outrows: Iterable[InstalledCSVRow],
-) -> List[Tuple[str, str, str]]:
+) -> list[tuple[str, str, str]]:
"""Normalize the given rows of a RECORD file.
Items in each row are converted into str. Rows are then sorted to make
@@ -239,17 +231,17 @@ def _fs_to_record_path(path: str, lib_dir: str) -> RecordPath:
def get_csv_rows_for_installed(
- old_csv_rows: List[List[str]],
- installed: Dict[RecordPath, RecordPath],
- changed: Set[RecordPath],
- generated: List[str],
+ old_csv_rows: list[list[str]],
+ installed: dict[RecordPath, RecordPath],
+ changed: set[RecordPath],
+ generated: list[str],
lib_dir: str,
-) -> List[InstalledCSVRow]:
+) -> list[InstalledCSVRow]:
"""
:param installed: A map from archive RECORD path to installation RECORD
path.
"""
- installed_rows: List[InstalledCSVRow] = []
+ installed_rows: list[InstalledCSVRow] = []
for row in old_csv_rows:
if len(row) > 3:
logger.warning("RECORD line has more than three elements: %s", row)
@@ -270,7 +262,7 @@ def get_csv_rows_for_installed(
]
-def get_console_script_specs(console: Dict[str, str]) -> List[str]:
+def get_console_script_specs(console: dict[str, str]) -> list[str]:
"""
Given the mapping from entrypoint name to callable, return the relevant
console script specs.
@@ -384,7 +376,7 @@ def save(self) -> None:
class ScriptFile:
- def __init__(self, file: "File") -> None:
+ def __init__(self, file: File) -> None:
self._file = file
self.src_record_path = self._file.src_record_path
self.dest_path = self._file.dest_path
@@ -399,7 +391,7 @@ class MissingCallableSuffix(InstallationError):
def __init__(self, entry_point: str) -> None:
super().__init__(
f"Invalid script entry point: {entry_point} - A callable "
- "suffix is required. Cf https://packaging.python.org/"
+ "suffix is required. See https://packaging.python.org/"
"specifications/entry-points/#use-for-scripts for more "
"information."
)
@@ -412,9 +404,21 @@ 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 = textwrap.dedent(
+ """\
+ import sys
+ from %(module)s import %(import_name)s
+ if __name__ == '__main__':
+ sys.argv[0] = sys.argv[0].removesuffix('.exe')
+ sys.exit(%(func)s())
+"""
+ )
+
def make(
- self, specification: str, options: Optional[Dict[str, Any]] = None
- ) -> List[str]:
+ self, specification: str, options: dict[str, Any] | None = None
+ ) -> list[str]:
_raise_for_invalid_entrypoint(specification)
return super().make(specification, options)
@@ -426,7 +430,7 @@ def _install_wheel( # noqa: C901, PLR0915 function is too long
scheme: Scheme,
pycompile: bool = True,
warn_script_location: bool = True,
- direct_url: Optional[DirectUrl] = None,
+ direct_url: DirectUrl | None = None,
requested: bool = False,
) -> None:
"""Install a wheel.
@@ -455,9 +459,9 @@ def _install_wheel( # noqa: C901, PLR0915 function is too long
# installed = files copied from the wheel to the destination
# changed = files changed while installing (scripts #! line typically)
# generated = files newly generated during the install (script wrappers)
- installed: Dict[RecordPath, RecordPath] = {}
- changed: Set[RecordPath] = set()
- generated: List[str] = []
+ installed: dict[RecordPath, RecordPath] = {}
+ changed: set[RecordPath] = set()
+ generated: list[str] = []
def record_installed(
srcfile: RecordPath, destfile: str, modified: bool = False
@@ -483,8 +487,8 @@ def assert_no_path_traversal(dest_dir_path: str, target_path: str) -> None:
def root_scheme_file_maker(
zip_file: ZipFile, dest: str
- ) -> Callable[[RecordPath], "File"]:
- def make_root_scheme_file(record_path: RecordPath) -> "File":
+ ) -> Callable[[RecordPath], File]:
+ def make_root_scheme_file(record_path: RecordPath) -> File:
normed_path = os.path.normpath(record_path)
dest_path = os.path.join(dest, normed_path)
assert_no_path_traversal(dest, dest_path)
@@ -494,10 +498,10 @@ def make_root_scheme_file(record_path: RecordPath) -> "File":
def data_scheme_file_maker(
zip_file: ZipFile, scheme: Scheme
- ) -> Callable[[RecordPath], "File"]:
+ ) -> Callable[[RecordPath], File]:
scheme_paths = {key: getattr(scheme, key) for key in SCHEME_KEYS}
- def make_data_scheme_file(record_path: RecordPath) -> "File":
+ def make_data_scheme_file(record_path: RecordPath) -> File:
normed_path = os.path.normpath(record_path)
try:
_, scheme_key, dest_subpath = normed_path.split(os.path.sep, 2)
@@ -529,7 +533,7 @@ def make_data_scheme_file(record_path: RecordPath) -> "File":
def is_data_scheme_path(path: RecordPath) -> bool:
return path.split("/", 1)[0].endswith(".data")
- paths = cast(List[RecordPath], wheel_zip.namelist())
+ paths = cast(list[RecordPath], wheel_zip.namelist())
file_paths = filterfalse(is_dir_path, paths)
root_scheme_paths, data_scheme_paths = partition(is_data_scheme_path, file_paths)
@@ -555,7 +559,7 @@ def is_script_scheme_path(path: RecordPath) -> bool:
)
console, gui = get_entrypoints(distribution)
- def is_entrypoint_wrapper(file: "File") -> bool:
+ def is_entrypoint_wrapper(file: File) -> bool:
# EP, EP.exe and EP-script.py are scripts generated for
# entry point EP by setuptools
path = file.dest_path
@@ -724,7 +728,7 @@ def install_wheel(
req_description: str,
pycompile: bool = True,
warn_script_location: bool = True,
- direct_url: Optional[DirectUrl] = None,
+ direct_url: DirectUrl | None = None,
requested: bool = False,
) -> None:
with ZipFile(wheel_path, allowZip64=True) as z:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/operations/prepare.py b/addons/source-python/packages/site-packages/pip/_internal/operations/prepare.py
index e6aa34472..67f9ee950 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/operations/prepare.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/operations/prepare.py
@@ -1,18 +1,20 @@
-"""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
+from __future__ import annotations
import mimetypes
import os
import shutil
+from collections.abc import Iterable
from dataclasses import dataclass
from pathlib import Path
-from typing import Dict, Iterable, List, Optional
+from typing import TYPE_CHECKING
from pip._vendor.packaging.utils import canonicalize_name
+from pip._internal.build_env import BuildEnvironmentInstaller
from pip._internal.distributions import make_distribution_for_install_requirement
from pip._internal.distributions.installed import InstalledDistribution
from pip._internal.exceptions import (
@@ -29,7 +31,7 @@
from pip._internal.models.direct_url import ArchiveInfo
from pip._internal.models.link import Link
from pip._internal.models.wheel import Wheel
-from pip._internal.network.download import BatchDownloader, Downloader
+from pip._internal.network.download import Downloader
from pip._internal.network.lazy_wheel import (
HTTPRangeRequestUnsupported,
dist_from_wheel_url,
@@ -54,13 +56,16 @@
from pip._internal.utils.unpacking import unpack_file
from pip._internal.vcs import vcs
+if TYPE_CHECKING:
+ from pip._internal.cli.progress_bars import BarType
+
logger = getLogger(__name__)
def _get_prepared_distribution(
req: InstallRequirement,
build_tracker: BuildTracker,
- finder: PackageFinder,
+ build_env_installer: BuildEnvironmentInstaller,
build_isolation: bool,
check_build_deps: bool,
) -> BaseDistribution:
@@ -70,7 +75,7 @@ def _get_prepared_distribution(
if tracker_id is not None:
with build_tracker.track(req, tracker_id):
abstract_dist.prepare_distribution_metadata(
- finder, build_isolation, check_build_deps
+ build_env_installer, build_isolation, check_build_deps
)
return abstract_dist.get_metadata_distribution()
@@ -84,18 +89,23 @@ def unpack_vcs_link(link: Link, location: str, verbosity: int) -> None:
@dataclass
class File:
path: str
- content_type: Optional[str] = None
+ content_type: str | None = None
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(
link: Link,
download: Downloader,
- download_dir: Optional[str] = None,
- hashes: Optional[Hashes] = None,
+ download_dir: str | None = None,
+ hashes: Hashes | None = None,
) -> File:
temp_dir = TempDirectory(kind="unpack", globally_managed=True)
# If a download dir is specified, is the file already downloaded there?
@@ -116,7 +126,7 @@ def get_http_url(
def get_file_url(
- link: Link, download_dir: Optional[str] = None, hashes: Optional[Hashes] = None
+ link: Link, download_dir: str | None = None, hashes: Hashes | None = None
) -> File:
"""Get file and optionally check its hash."""
# If a download dir is specified, is the file already there and valid?
@@ -144,9 +154,9 @@ def unpack_url(
location: str,
download: Downloader,
verbosity: int,
- download_dir: Optional[str] = None,
- hashes: Optional[Hashes] = None,
-) -> Optional[File]:
+ download_dir: str | None = None,
+ hashes: Hashes | None = None,
+) -> File | None:
"""Unpack link into location, downloading if required.
:param hashes: A Hashes object, one of whose embedded hashes must match,
@@ -185,9 +195,9 @@ def unpack_url(
def _check_download_dir(
link: Link,
download_dir: str,
- hashes: Optional[Hashes],
+ hashes: Hashes | None,
warn_on_hash_mismatch: bool = True,
-) -> Optional[str]:
+) -> str | None:
"""Check download_dir for previously downloaded file with correct hash
If a correct file is found return its path else None
"""
@@ -217,14 +227,16 @@ class RequirementPreparer:
def __init__(
self,
+ *,
build_dir: str,
- download_dir: Optional[str],
+ download_dir: str | None,
src_dir: str,
build_isolation: bool,
+ build_isolation_installer: BuildEnvironmentInstaller,
check_build_deps: bool,
build_tracker: BuildTracker,
session: PipSession,
- progress_bar: str,
+ progress_bar: BarType,
finder: PackageFinder,
require_hashes: bool,
use_user_site: bool,
@@ -239,7 +251,6 @@ def __init__(
self.build_tracker = build_tracker
self._session = session
self._download = Downloader(session, progress_bar)
- self._batch_download = BatchDownloader(session, progress_bar)
self.finder = finder
# Where still-packed archives should be written to. If None, they are
@@ -248,6 +259,7 @@ def __init__(
# Is build isolation allowed?
self.build_isolation = build_isolation
+ self.build_env_installer = build_isolation_installer
# Should check build dependencies?
self.check_build_deps = check_build_deps
@@ -268,7 +280,7 @@ def __init__(
self.legacy_resolver = legacy_resolver
# Memoized downloaded files, as mapping of url: path.
- self._downloaded: Dict[str, str] = {}
+ self._downloaded: dict[str, str] = {}
# Previous "header" printed for a link-based InstallRequirement
self._previous_requirement_header = ("", "")
@@ -286,7 +298,7 @@ def _log_preparing_link(self, req: InstallRequirement) -> None:
# would already be included if we used req directly)
if req.req and req.comes_from:
if isinstance(req.comes_from, str):
- comes_from: Optional[str] = req.comes_from
+ comes_from: str | None = req.comes_from
else:
comes_from = req.comes_from.from_path()
if comes_from:
@@ -358,7 +370,7 @@ def _get_linked_req_hashes(self, req: InstallRequirement) -> Hashes:
def _fetch_metadata_only(
self,
req: InstallRequirement,
- ) -> Optional[BaseDistribution]:
+ ) -> BaseDistribution | None:
if self.legacy_resolver:
logger.debug(
"Metadata-only fetching is not used in the legacy resolver",
@@ -377,7 +389,7 @@ def _fetch_metadata_only(
def _fetch_metadata_using_link_data_attr(
self,
req: InstallRequirement,
- ) -> Optional[BaseDistribution]:
+ ) -> BaseDistribution | None:
"""Fetch metadata from the data-dist-info-metadata attribute, if possible."""
# (1) Get the link to the metadata file, if provided by the backend.
metadata_link = req.link.metadata_link()
@@ -418,7 +430,7 @@ def _fetch_metadata_using_link_data_attr(
def _fetch_metadata_using_lazy_wheel(
self,
link: Link,
- ) -> Optional[BaseDistribution]:
+ ) -> BaseDistribution | None:
"""Fetch metadata using lazy wheel, if possible."""
# --use-feature=fast-deps must be provided.
if not self.use_lazy_wheel:
@@ -431,7 +443,7 @@ def _fetch_metadata_using_lazy_wheel(
return None
wheel = Wheel(link.filename)
- name = canonicalize_name(wheel.name)
+ name = wheel.name
logger.info(
"Obtaining dependency information from %s %s",
name,
@@ -457,15 +469,12 @@ def _complete_partial_requirements(
# Map each link to the requirement that owns it. This allows us to set
# `req.local_file_path` on the appropriate requirement after passing
# all the links at once into BatchDownloader.
- links_to_fully_download: Dict[Link, InstallRequirement] = {}
+ links_to_fully_download: dict[Link, InstallRequirement] = {}
for req in partially_downloaded_reqs:
assert req.link
links_to_fully_download[req.link] = req
- batch_download = self._batch_download(
- links_to_fully_download.keys(),
- temp_dir,
- )
+ batch_download = self._download.batch(links_to_fully_download.keys(), temp_dir)
for link, (filepath, _) in batch_download:
logger.debug("Downloading link %s to %s", link, filepath)
req = links_to_fully_download[link]
@@ -521,6 +530,12 @@ def prepare_linked_requirement(
metadata_dist = self._fetch_metadata_only(req)
if metadata_dist is not None:
req.needs_more_preparation = True
+ req.set_dist(metadata_dist)
+ # Ensure download_info is available even in dry-run mode
+ if req.download_info is None:
+ req.download_info = direct_url_from_link(
+ req.link, req.source_dir
+ )
return metadata_dist
# None of the optimizations worked, fully prepare the requirement
@@ -542,7 +557,7 @@ def prepare_linked_requirements_more(
# Prepare requirements we found were already downloaded for some
# reason. The other downloads will be completed separately.
- partially_downloaded_reqs: List[InstallRequirement] = []
+ partially_downloaded_reqs: list[InstallRequirement] = []
for req in reqs:
if req.needs_more_preparation:
partially_downloaded_reqs.append(req)
@@ -642,7 +657,7 @@ def _prepare_linked_requirement(
dist = _get_prepared_distribution(
req,
self.build_tracker,
- self.finder,
+ self.build_env_installer,
self.build_isolation,
self.check_build_deps,
)
@@ -698,7 +713,7 @@ def prepare_editable_requirement(
dist = _get_prepared_distribution(
req,
self.build_tracker,
- self.finder,
+ self.build_env_installer,
self.build_isolation,
self.check_build_deps,
)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/pyproject.py b/addons/source-python/packages/site-packages/pip/_internal/pyproject.py
index 0e8452f39..8c2f7221c 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/pyproject.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/pyproject.py
@@ -1,13 +1,8 @@
-import importlib.util
+from __future__ import annotations
+
import os
-import sys
from collections import namedtuple
-from typing import Any, List, Optional
-
-if sys.version_info >= (3, 11):
- import tomllib
-else:
- from pip._vendor import tomli as tomllib
+from typing import Any
from pip._vendor.packaging.requirements import InvalidRequirement
@@ -16,6 +11,7 @@
InvalidPyProjectBuildRequires,
MissingPyProjectBuildRequires,
)
+from pip._internal.utils.compat import tomllib
from pip._internal.utils.packaging import get_requirement
@@ -33,13 +29,11 @@ def make_pyproject_path(unpacked_source_directory: str) -> str:
def load_pyproject_toml(
- use_pep517: Optional[bool], pyproject_toml: str, setup_py: str, req_name: str
-) -> Optional[BuildSystemDetails]:
+ pyproject_toml: str, setup_py: str, req_name: str
+) -> BuildSystemDetails:
"""Load the pyproject.toml file.
Parameters:
- use_pep517 - Has the user requested PEP 517 processing? None
- means the user hasn't explicitly specified.
pyproject_toml - Location of the project's pyproject.toml file
setup_py - Location of the project's setup.py file
req_name - The name of the requirement we're processing (for
@@ -72,57 +66,7 @@ def load_pyproject_toml(
else:
build_system = None
- # The following cases must use PEP 517
- # 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
- # strtobool() returning an integer in pip's configuration code).
- if has_pyproject and not has_setup:
- if use_pep517 is not None and not use_pep517:
- raise InstallationError(
- "Disabling PEP 517 processing is invalid: "
- "project does not have a setup.py"
- )
- use_pep517 = True
- elif build_system and "build-backend" in build_system:
- if use_pep517 is not None and not use_pep517:
- raise InstallationError(
- "Disabling PEP 517 processing is invalid: "
- "project specifies a build backend of {} "
- "in pyproject.toml".format(build_system["build-backend"])
- )
- use_pep517 = True
-
- # 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 wheels.
-
- # We fallback to PEP 517 when without setuptools or without the wheel package,
- # so setuptools can be installed as a default build backend.
- # For more info see:
- # https://discuss.python.org/t/pip-without-setuptools-could-the-experience-be-improved/11810/9
- # https://github.com/pypa/pip/issues/8559
- elif use_pep517 is None:
- use_pep517 = (
- has_pyproject
- or not importlib.util.find_spec("setuptools")
- or not importlib.util.find_spec("wheel")
- )
-
- # At this point, we know whether we're going to use PEP 517.
- assert use_pep517 is not None
-
- # If we're using the legacy code path, there is nothing further
- # for us to do here.
- if not use_pep517:
- return None
-
if build_system is None:
- # Either the user has a pyproject.toml with no build-system
- # section, or the user has no pyproject.toml, but has opted in
- # explicitly via --use-pep517.
# In the absence of any explicit backend specification, we
# assume the setuptools backend that most closely emulates the
# traditional direct setup.py execution, and require wheel and
@@ -133,12 +77,6 @@ def load_pyproject_toml(
"build-backend": "setuptools.build_meta:__legacy__",
}
- # If we're using PEP 517, we have build system information (either
- # from pyproject.toml, or defaulted by the code above).
- # Note that at this point, we do not know if the user has actually
- # specified a backend, though.
- assert build_system is not None
-
# Ensure that the build-system section in pyproject.toml conforms
# to PEP 518.
@@ -166,7 +104,7 @@ def load_pyproject_toml(
backend = build_system.get("build-backend")
backend_path = build_system.get("backend-path", [])
- check: List[str] = []
+ check: list[str] = []
if backend is None:
# If the user didn't specify a backend, we assume they want to use
# the setuptools backend. But we can't be sure they have included
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/__init__.py b/addons/source-python/packages/site-packages/pip/_internal/req/__init__.py
index 422d851d7..5fc8752d8 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/req/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/__init__.py
@@ -1,8 +1,11 @@
+from __future__ import annotations
+
import collections
import logging
+from collections.abc import Generator
from dataclasses import dataclass
-from typing import Generator, List, Optional, Sequence, Tuple
+from pip._internal.cli.progress_bars import BarType, get_install_progress_renderer
from pip._internal.utils.logging import indent_log
from .req_file import parse_requirements
@@ -25,23 +28,23 @@ class InstallationResult:
def _validate_requirements(
- requirements: List[InstallRequirement],
-) -> Generator[Tuple[str, InstallRequirement], None, None]:
+ requirements: list[InstallRequirement],
+) -> Generator[tuple[str, InstallRequirement], None, None]:
for req in requirements:
assert req.name, f"invalid to-be-installed requirement: {req}"
yield req.name, req
def install_given_reqs(
- requirements: List[InstallRequirement],
- global_options: Sequence[str],
- root: Optional[str],
- home: Optional[str],
- prefix: Optional[str],
+ requirements: list[InstallRequirement],
+ root: str | None,
+ home: str | None,
+ prefix: str | None,
warn_script_location: bool,
use_user_site: bool,
pycompile: bool,
-) -> List[InstallationResult]:
+ progress_bar: BarType,
+) -> list[InstallationResult]:
"""
Install everything in the given list.
@@ -57,8 +60,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():
@@ -68,7 +82,6 @@ def install_given_reqs(
try:
requirement.install(
- global_options,
root=root,
home=home,
prefix=prefix,
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/constructors.py b/addons/source-python/packages/site-packages/pip/_internal/req/constructors.py
index 56a964f31..7fef6b7e0 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/req/constructors.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/constructors.py
@@ -8,12 +8,14 @@
InstallRequirement.
"""
+from __future__ import annotations
+
import copy
import logging
import os
import re
+from collections.abc import Collection
from dataclasses import dataclass
-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
@@ -41,11 +43,11 @@
operators = Specifier._operators.keys()
-def _strip_extras(path: str) -> Tuple[str, Optional[str]]:
+def _strip_extras(path: str) -> tuple[str, str | None]:
m = re.match(r"^(.+)(\[[^\]]+\])$", path)
extras = None
if m:
- path_no_extras = m.group(1)
+ path_no_extras = m.group(1).rstrip()
extras = m.group(2)
else:
path_no_extras = path
@@ -53,19 +55,19 @@ def _strip_extras(path: str) -> Tuple[str, Optional[str]]:
return path_no_extras, extras
-def convert_extras(extras: Optional[str]) -> Set[str]:
+def convert_extras(extras: str | None) -> set[str]:
if not extras:
return set()
return get_requirement("placeholder" + extras.lower()).extras
-def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requirement:
+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(
+ match: re.Match[str] | None = re.fullmatch(
# see https://peps.python.org/pep-0508/#complete-grammar
r"([\w\t .-]+)(\[[^\]]*\])?(.*)",
str(req),
@@ -75,8 +77,8 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
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)
+ pre: str | None = match.group(1)
+ post: str | None = 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"
@@ -84,17 +86,25 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
return get_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
- - an URL
- - extras
- - editable options
- Accepted requirements:
- svn+http://blahblah@rev#egg=Foobar[baz]&subdirectory=version_subdir
- .[some_extra]
- """
+def _parse_direct_url_editable(editable_req: str) -> tuple[str | None, str, set[str]]:
+ try:
+ req = Requirement(editable_req)
+ except InvalidRequirement:
+ pass
+ else:
+ if req.url:
+ # Join the marker back into the name part. This will be parsed out
+ # later into a Requirement again.
+ if req.marker:
+ name = f"{req.name} ; {req.marker}"
+ else:
+ name = req.name
+ return (name, req.url, req.extras)
+
+ raise ValueError
+
+def _parse_pip_syntax_editable(editable_req: str) -> tuple[str | None, str, set[str]]:
url = editable_req
# If a file path is specified with extras, strip off the extras.
@@ -120,9 +130,27 @@ def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
url = f"{version_control}+{url}"
break
+ return Link(url).egg_fragment, url, set()
+
+
+def parse_editable(editable_req: str) -> tuple[str | None, str, set[str]]:
+ """Parses an editable requirement into:
+ - a requirement name with environment markers
+ - an URL
+ - extras
+ Accepted requirements:
+ - svn+http://blahblah@rev#egg=Foobar[baz]&subdirectory=version_subdir
+ - local_path[some_extra]
+ - Foobar[extra] @ svn+http://blahblah@rev#subdirectory=subdir ; markers
+ """
+ try:
+ package_name, url, extras = _parse_direct_url_editable(editable_req)
+ except ValueError:
+ package_name, url, extras = _parse_pip_syntax_editable(editable_req)
+
link = Link(url)
- if not link.is_vcs:
+ if not link.is_vcs and not link.url.startswith("file:"):
backends = ", ".join(vcs.all_schemes)
raise InstallationError(
f"{editable_req} is not a valid editable requirement. "
@@ -130,13 +158,13 @@ def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
f"(beginning with {backends})."
)
- package_name = link.egg_fragment
- if not package_name:
+ # The project name can be inferred from local file URIs easily.
+ if not package_name and not link.url.startswith("file:"):
raise InstallationError(
f"Could not detect requirement name for '{editable_req}', "
- "please specify one with #egg=your_package_name"
+ "please specify one with your_package_name @ URL"
)
- return package_name, url, set()
+ return package_name, url, extras
def check_first_requirement_in_file(filename: str) -> None:
@@ -194,10 +222,10 @@ def deduce_helpful_msg(req: str) -> str:
@dataclass(frozen=True)
class RequirementParts:
- requirement: Optional[Requirement]
- link: Optional[Link]
- markers: Optional[Marker]
- extras: Set[str]
+ requirement: Requirement | None
+ link: Link | None
+ markers: Marker | None
+ extras: set[str]
def parse_req_from_editable(editable_req: str) -> RequirementParts:
@@ -205,7 +233,7 @@ def parse_req_from_editable(editable_req: str) -> RequirementParts:
if name is not None:
try:
- req: Optional[Requirement] = get_requirement(name)
+ req: Requirement | None = get_requirement(name)
except InvalidRequirement as exc:
raise InstallationError(f"Invalid requirement: {name!r}: {exc}")
else:
@@ -221,19 +249,19 @@ def parse_req_from_editable(editable_req: str) -> RequirementParts:
def install_req_from_editable(
editable_req: str,
- comes_from: Optional[Union[InstallRequirement, str]] = None,
+ comes_from: InstallRequirement | str | None = None,
*,
- use_pep517: Optional[bool] = None,
isolated: bool = False,
- global_options: Optional[List[str]] = None,
- hash_options: Optional[Dict[str, List[str]]] = None,
+ hash_options: dict[str, list[str]] | None = None,
constraint: bool = False,
user_supplied: bool = False,
permit_editable_wheels: bool = False,
- config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+ config_settings: dict[str, str | list[str]] | None = None,
) -> InstallRequirement:
- parts = parse_req_from_editable(editable_req)
+ if constraint:
+ raise InstallationError("Editable requirements are not allowed as constraints")
+ parts = parse_req_from_editable(editable_req)
return InstallRequirement(
parts.requirement,
comes_from=comes_from,
@@ -242,9 +270,7 @@ def install_req_from_editable(
permit_editable_wheels=permit_editable_wheels,
link=parts.link,
constraint=constraint,
- use_pep517=use_pep517,
isolated=isolated,
- global_options=global_options,
hash_options=hash_options,
config_settings=config_settings,
extras=parts.extras,
@@ -270,7 +296,7 @@ def _looks_like_path(name: str) -> bool:
return False
-def _get_url_from_path(path: str, name: str) -> Optional[str]:
+def _get_url_from_path(path: str, name: str) -> str | None:
"""
First, it checks whether a provided path is an installable directory. If it
is, returns the path.
@@ -304,7 +330,7 @@ def _get_url_from_path(path: str, name: str) -> Optional[str]:
return path_to_url(path)
-def parse_req_from_line(name: str, line_source: Optional[str]) -> RequirementParts:
+def parse_req_from_line(name: str, line_source: str | None) -> RequirementParts:
if is_url(name):
marker_sep = "; "
else:
@@ -376,7 +402,7 @@ def _parse_req_string(req_as_string: str) -> Requirement:
raise InstallationError(msg)
if req_as_string is not None:
- req: Optional[Requirement] = _parse_req_string(req_as_string)
+ req: Requirement | None = _parse_req_string(req_as_string)
else:
req = None
@@ -385,16 +411,14 @@ def _parse_req_string(req_as_string: str) -> Requirement:
def install_req_from_line(
name: str,
- comes_from: Optional[Union[str, InstallRequirement]] = None,
+ comes_from: str | InstallRequirement | None = None,
*,
- use_pep517: Optional[bool] = None,
isolated: bool = False,
- global_options: Optional[List[str]] = None,
- hash_options: Optional[Dict[str, List[str]]] = None,
+ hash_options: dict[str, list[str]] | None = None,
constraint: bool = False,
- line_source: Optional[str] = None,
+ line_source: str | None = None,
user_supplied: bool = False,
- config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+ config_settings: dict[str, str | list[str]] | None = None,
) -> InstallRequirement:
"""Creates an InstallRequirement from a name, which might be a
requirement, directory containing 'setup.py', filename, or URL.
@@ -409,9 +433,7 @@ def install_req_from_line(
comes_from,
link=parts.link,
markers=parts.markers,
- use_pep517=use_pep517,
isolated=isolated,
- global_options=global_options,
hash_options=hash_options,
config_settings=config_settings,
constraint=constraint,
@@ -422,9 +444,8 @@ def install_req_from_line(
def install_req_from_req_string(
req_string: str,
- comes_from: Optional[InstallRequirement] = None,
+ comes_from: InstallRequirement | None = None,
isolated: bool = False,
- use_pep517: Optional[bool] = None,
user_supplied: bool = False,
) -> InstallRequirement:
try:
@@ -453,7 +474,6 @@ def install_req_from_req_string(
req,
comes_from,
isolated=isolated,
- use_pep517=use_pep517,
user_supplied=user_supplied,
)
@@ -461,15 +481,13 @@ def install_req_from_req_string(
def install_req_from_parsed_requirement(
parsed_req: ParsedRequirement,
isolated: bool = False,
- use_pep517: Optional[bool] = None,
user_supplied: bool = False,
- config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+ config_settings: dict[str, str | list[str]] | None = None,
) -> InstallRequirement:
if parsed_req.is_editable:
req = install_req_from_editable(
parsed_req.requirement,
comes_from=parsed_req.comes_from,
- use_pep517=use_pep517,
constraint=parsed_req.constraint,
isolated=isolated,
user_supplied=user_supplied,
@@ -480,13 +498,7 @@ def install_req_from_parsed_requirement(
req = install_req_from_line(
parsed_req.requirement,
comes_from=parsed_req.comes_from,
- use_pep517=use_pep517,
isolated=isolated,
- global_options=(
- parsed_req.options.get("global_options", [])
- if parsed_req.options
- else []
- ),
hash_options=(
parsed_req.options.get("hashes", {}) if parsed_req.options else {}
),
@@ -507,9 +519,7 @@ def install_req_from_link_and_ireq(
editable=ireq.editable,
link=link,
markers=ireq.markers,
- use_pep517=ireq.use_pep517,
isolated=ireq.isolated,
- global_options=ireq.global_options,
hash_options=ireq.hash_options,
config_settings=ireq.config_settings,
user_supplied=ireq.user_supplied,
@@ -530,9 +540,7 @@ def install_req_drop_extras(ireq: InstallRequirement) -> InstallRequirement:
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=[],
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/pep723.py b/addons/source-python/packages/site-packages/pip/_internal/req/pep723.py
new file mode 100644
index 000000000..805abed78
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/pep723.py
@@ -0,0 +1,41 @@
+import re
+from typing import Any
+
+from pip._internal.utils.compat import tomllib
+
+REGEX = r"(?m)^# /// (?P[a-zA-Z0-9-]+)$\s(?P(^#(| .*)$\s)+)^# ///$"
+
+
+class PEP723Exception(ValueError):
+ """Raised to indicate a problem when parsing PEP 723 metadata from a script"""
+
+ def __init__(self, msg: str) -> None:
+ self.msg = msg
+
+
+def pep723_metadata(scriptfile: str) -> dict[str, Any]:
+ with open(scriptfile) as f:
+ script = f.read()
+
+ name = "script"
+ matches = list(
+ filter(lambda m: m.group("type") == name, re.finditer(REGEX, script))
+ )
+
+ if len(matches) > 1:
+ raise PEP723Exception(f"Multiple {name!r} blocks found in {scriptfile!r}")
+ elif len(matches) == 1:
+ content = "".join(
+ line[2:] if line.startswith("# ") else line[1:]
+ for line in matches[0].group("content").splitlines(keepends=True)
+ )
+ try:
+ metadata = tomllib.loads(content)
+ except Exception as exc:
+ raise PEP723Exception(f"Failed to parse TOML in {scriptfile!r}") from exc
+ else:
+ raise PEP723Exception(
+ f"File does not contain {name!r} metadata: {scriptfile!r}"
+ )
+
+ return metadata
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/req_dependency_group.py b/addons/source-python/packages/site-packages/pip/_internal/req/req_dependency_group.py
new file mode 100644
index 000000000..396ac1bb6
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/req_dependency_group.py
@@ -0,0 +1,75 @@
+from collections.abc import Iterable, Iterator
+from typing import Any
+
+from pip._vendor.dependency_groups import DependencyGroupResolver
+
+from pip._internal.exceptions import InstallationError
+from pip._internal.utils.compat import tomllib
+
+
+def parse_dependency_groups(groups: list[tuple[str, str]]) -> list[str]:
+ """
+ Parse dependency groups data as provided via the CLI, in a `[path:]group` syntax.
+
+ Raises InstallationErrors if anything goes wrong.
+ """
+ resolvers = _build_resolvers(path for (path, _) in groups)
+ return list(_resolve_all_groups(resolvers, groups))
+
+
+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(path: str) -> dict[str, Any]:
+ """
+ This helper loads a pyproject.toml as TOML.
+
+ It raises an InstallationError if the operation fails.
+ """
+ try:
+ with open(path, "rb") as fp:
+ return tomllib.load(fp)
+ except FileNotFoundError:
+ raise InstallationError(f"{path} not found. Cannot resolve '--group' option.")
+ except tomllib.TOMLDecodeError as e:
+ raise InstallationError(f"Error parsing {path}: {e}") from e
+ except OSError as e:
+ raise InstallationError(f"Error reading {path}: {e}") from e
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/req_file.py b/addons/source-python/packages/site-packages/pip/_internal/req/req_file.py
index f6ba70fe7..9eb58ce66 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/req/req_file.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/req_file.py
@@ -2,6 +2,8 @@
Requirements file parsing
"""
+from __future__ import annotations
+
import codecs
import locale
import logging
@@ -11,23 +13,19 @@
import shlex
import sys
import urllib.parse
+from collections.abc import Generator, Iterable
from dataclasses import dataclass
from optparse import Values
from typing import (
TYPE_CHECKING,
Any,
Callable,
- Dict,
- Generator,
- Iterable,
- List,
NoReturn,
- Optional,
- Tuple,
)
from pip._internal.cli import cmdoptions
from pip._internal.exceptions import InstallationError, RequirementsFileParseError
+from pip._internal.models.release_control import ReleaseControl
from pip._internal.models.search_scope import SearchScope
if TYPE_CHECKING:
@@ -36,9 +34,9 @@
__all__ = ["parse_requirements"]
-ReqFileLines = Iterable[Tuple[int, str]]
+ReqFileLines = Iterable[tuple[int, str]]
-LineParser = Callable[[str], Tuple[str, Values]]
+LineParser = Callable[[str], tuple[str, Values]]
SCHEME_RE = re.compile(r"^(http|https|file):", re.I)
COMMENT_RE = re.compile(r"(^|\s+)#.*$")
@@ -49,7 +47,7 @@
# 2013 Edition.
ENV_VAR_RE = re.compile(r"(?P\$\{(?P[A-Z0-9_]+)\})")
-SUPPORTED_OPTIONS: List[Callable[..., optparse.Option]] = [
+SUPPORTED_OPTIONS: list[Callable[..., optparse.Option]] = [
cmdoptions.index_url,
cmdoptions.extra_index_url,
cmdoptions.no_index,
@@ -62,18 +60,19 @@
cmdoptions.prefer_binary,
cmdoptions.require_hashes,
cmdoptions.pre,
+ cmdoptions.all_releases,
+ cmdoptions.only_final,
cmdoptions.trusted_host,
cmdoptions.use_new_feature,
]
# options to be passed to requirements
-SUPPORTED_OPTIONS_REQ: List[Callable[..., optparse.Option]] = [
- cmdoptions.global_options,
+SUPPORTED_OPTIONS_REQ: list[Callable[..., optparse.Option]] = [
cmdoptions.hash,
cmdoptions.config_settings,
]
-SUPPORTED_OPTIONS_EDITABLE_REQ: List[Callable[..., optparse.Option]] = [
+SUPPORTED_OPTIONS_EDITABLE_REQ: list[Callable[..., optparse.Option]] = [
cmdoptions.config_settings,
]
@@ -86,7 +85,7 @@
# 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]] = [
+BOMS: list[tuple[bytes, str]] = [
(codecs.BOM_UTF8, "utf-8"),
(codecs.BOM_UTF32, "utf-32"),
(codecs.BOM_UTF32_BE, "utf-32-be"),
@@ -118,8 +117,8 @@ class ParsedRequirement:
is_editable: bool
comes_from: str
constraint: bool
- options: Optional[Dict[str, Any]]
- line_source: Optional[str]
+ options: dict[str, Any] | None
+ line_source: str | None
@dataclass(frozen=True)
@@ -137,7 +136,7 @@ def is_editable(self) -> bool:
return bool(self.opts.editables)
@property
- def requirement(self) -> Optional[str]:
+ def requirement(self) -> str | None:
if self.args:
return self.args
elif self.is_editable:
@@ -148,9 +147,9 @@ def requirement(self) -> Optional[str]:
def parse_requirements(
filename: str,
- session: "PipSession",
- finder: Optional["PackageFinder"] = None,
- options: Optional[optparse.Values] = None,
+ session: PipSession,
+ finder: PackageFinder | None = None,
+ options: optparse.Values | None = None,
constraint: bool = False,
) -> Generator[ParsedRequirement, None, None]:
"""Parse a requirements file and yield ParsedRequirement instances.
@@ -187,7 +186,7 @@ def preprocess(content: str) -> ReqFileLines:
def handle_requirement_line(
line: ParsedLine,
- options: Optional[optparse.Values] = None,
+ options: optparse.Values | None = None,
) -> ParsedRequirement:
# preserve for the nested code path
line_comes_from = "{} {} (line {})".format(
@@ -223,9 +222,9 @@ def handle_option_line(
opts: Values,
filename: str,
lineno: int,
- finder: Optional["PackageFinder"] = None,
- options: Optional[optparse.Values] = None,
- session: Optional["PipSession"] = None,
+ finder: PackageFinder | None = None,
+ options: optparse.Values | None = None,
+ session: PipSession | None = None,
) -> None:
if opts.hashes:
logger.warning(
@@ -277,8 +276,16 @@ def handle_option_line(
)
finder.search_scope = search_scope
+ # Transform --pre into --all-releases :all:
if opts.pre:
- finder.set_allow_all_prereleases()
+ if not opts.release_control:
+ opts.release_control = ReleaseControl()
+ opts.release_control.all_releases.add(":all:")
+
+ if opts.release_control:
+ if not finder.release_control:
+ # First time seeing release_control, set it on finder
+ finder.set_release_control(opts.release_control)
if opts.prefer_binary:
finder.set_prefer_binary()
@@ -291,10 +298,10 @@ def handle_option_line(
def handle_line(
line: ParsedLine,
- options: Optional[optparse.Values] = None,
- finder: Optional["PackageFinder"] = None,
- session: Optional["PipSession"] = None,
-) -> Optional[ParsedRequirement]:
+ options: optparse.Values | None = None,
+ finder: PackageFinder | None = None,
+ session: PipSession | None = None,
+) -> ParsedRequirement | None:
"""Handle a single parsed requirements line; This can result in
creating/yielding requirements, or updating the finder.
@@ -336,7 +343,7 @@ def handle_line(
class RequirementsFileParser:
def __init__(
self,
- session: "PipSession",
+ session: PipSession,
line_parser: LineParser,
) -> None:
self._session = session
@@ -354,7 +361,7 @@ def _parse_and_recurse(
self,
filename: str,
constraint: bool,
- parsed_files_stack: List[Dict[str, Optional[str]]],
+ parsed_files_stack: list[dict[str, str | None]],
) -> Generator[ParsedLine, None, None]:
for line in self._parse_file(filename, constraint):
if line.requirement is None and (
@@ -426,8 +433,8 @@ def _parse_file(
)
-def get_line_parser(finder: Optional["PackageFinder"]) -> LineParser:
- def parse_line(line: str) -> Tuple[str, Values]:
+def get_line_parser(finder: PackageFinder | None) -> LineParser:
+ def parse_line(line: str) -> tuple[str, Values]:
# Build new parser for each line since it accumulates appendable
# options.
parser = build_parser()
@@ -435,6 +442,7 @@ def parse_line(line: str) -> Tuple[str, Values]:
defaults.index_url = None
if finder:
defaults.format_control = finder.format_control
+ defaults.release_control = finder.release_control
args_str, options_str = break_args_options(line)
@@ -450,7 +458,7 @@ def parse_line(line: str) -> Tuple[str, Values]:
return parse_line
-def break_args_options(line: str) -> Tuple[str, str]:
+def break_args_options(line: str) -> tuple[str, str]:
"""Break up the line into an args and options string. We only want to shlex
(and then optparse) the options, not the args. args can contain markers
which are corrupted by shlex.
@@ -459,7 +467,7 @@ def break_args_options(line: str) -> Tuple[str, str]:
args = []
options = tokens[:]
for token in tokens:
- if token.startswith("-") or token.startswith("--"):
+ if token.startswith(("-", "--")):
break
else:
args.append(token)
@@ -485,7 +493,7 @@ def build_parser() -> optparse.OptionParser:
# By default optparse sys.exits on parsing errors. We want to wrap
# that in our own exception.
- def parser_exit(self: Any, msg: str) -> "NoReturn":
+ def parser_exit(self: Any, msg: str) -> NoReturn:
raise OptionParsingError(msg)
# NOTE: mypy disallows assigning to a method
@@ -500,7 +508,7 @@ def join_lines(lines_enum: ReqFileLines) -> ReqFileLines:
comments). The joined line takes on the index of the first line.
"""
primary_line_number = None
- new_line: List[str] = []
+ new_line: list[str] = []
for line_number, line in lines_enum:
if not line.endswith("\\") or COMMENT_RE.match(line):
if COMMENT_RE.match(line):
@@ -564,7 +572,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.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/req_install.py b/addons/source-python/packages/site-packages/pip/_internal/req/req_install.py
index 3262d8265..bd4fb0717 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/req/req_install.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/req_install.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import functools
import logging
import os
@@ -5,9 +7,10 @@
import sys
import uuid
import zipfile
+from collections.abc import Collection, Iterable
from optparse import Values
from pathlib import Path
-from typing import Any, Collection, Dict, Iterable, List, Optional, Sequence, Union
+from typing import Any
from pip._vendor.packaging.markers import Marker
from pip._vendor.packaging.requirements import Requirement
@@ -31,12 +34,6 @@
from pip._internal.models.link import Link
from pip._internal.operations.build.metadata import generate_metadata
from pip._internal.operations.build.metadata_editable import generate_editable_metadata
-from pip._internal.operations.build.metadata_legacy import (
- generate_metadata as generate_metadata_legacy,
-)
-from pip._internal.operations.install.editable_legacy import (
- install_editable as install_editable_legacy,
-)
from pip._internal.operations.install.wheel import install_wheel
from pip._internal.pyproject import load_pyproject_toml, make_pyproject_path
from pip._internal.req.req_uninstall import UninstallPathSet
@@ -71,17 +68,15 @@ class InstallRequirement:
def __init__(
self,
- req: Optional[Requirement],
- comes_from: Optional[Union[str, "InstallRequirement"]],
+ req: Requirement | None,
+ comes_from: str | InstallRequirement | None,
editable: bool = False,
- link: Optional[Link] = None,
- markers: Optional[Marker] = None,
- use_pep517: Optional[bool] = None,
+ link: Link | None = None,
+ markers: Marker | None = None,
isolated: bool = False,
*,
- global_options: Optional[List[str]] = None,
- hash_options: Optional[Dict[str, List[str]]] = None,
- config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+ hash_options: dict[str, list[str]] | None = None,
+ config_settings: dict[str, str | list[str]] | None = None,
constraint: bool = False,
extras: Collection[str] = (),
user_supplied: bool = False,
@@ -99,7 +94,7 @@ def __init__(
# populating source_dir is done by the RequirementPreparer. Note this
# is not necessarily the directory where pyproject.toml or setup.py is
# located - that one is obtained via unpacked_source_directory.
- self.source_dir: Optional[str] = None
+ self.source_dir: str | None = None
if self.editable:
assert link
if link.is_file:
@@ -115,14 +110,14 @@ def __init__(
# 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
+ self.cached_wheel_source_link: Link | None = None
# Information about the location of the artifact that was downloaded . This
# property is guaranteed to be set in resolver results.
- self.download_info: Optional[DirectUrl] = None
+ self.download_info: DirectUrl | None = None
# Path to any downloaded or already-existing package.
- self.local_file_path: Optional[str] = None
+ self.local_file_path: str | None = None
if self.link and self.link.is_file:
self.local_file_path = self.link.file_path
@@ -137,16 +132,15 @@ def __init__(
self.markers = markers
# This holds the Distribution object if this requirement is already installed.
- self.satisfied_by: Optional[BaseDistribution] = None
+ self.satisfied_by: BaseDistribution | None = None
# Whether the installation process should try to uninstall an existing
# distribution before installing this requirement.
self.should_reinstall = False
# Temporary build location
- self._temp_build_dir: Optional[TempDirectory] = None
+ self._temp_build_dir: TempDirectory | None = None
# Set to True after successful installation
- self.install_succeeded: Optional[bool] = None
+ self.install_succeeded: bool | None = None
# Supplied options
- self.global_options = global_options if global_options else []
self.hash_options = hash_options if hash_options else {}
self.config_settings = config_settings
# Set to True after successful preparation of this requirement
@@ -163,39 +157,26 @@ def __init__(
# gets stored. We need this to pass to build_wheel, so the backend
# can ensure that the wheel matches the metadata (see the PEP for
# details).
- self.metadata_directory: Optional[str] = None
+ self.metadata_directory: str | None = None
+
+ # The cached metadata distribution that this requirement represents.
+ # See get_dist / set_dist.
+ self._distribution: BaseDistribution | None = None
# The static build requirements (from pyproject.toml)
- self.pyproject_requires: Optional[List[str]] = None
+ self.pyproject_requires: list[str] | None = None
# Build requirements that we will check are available
- self.requirements_to_check: List[str] = []
+ self.requirements_to_check: list[str] = []
# The PEP 517 backend we should use to build the project
- self.pep517_backend: Optional[BuildBackendHookCaller] = None
-
- # Are we using PEP 517 for this requirement?
- # After pyproject.toml has been loaded, the only valid values are True
- # and False. Before loading, None is valid (meaning "use the default").
- # Setting an explicit value before loading pyproject.toml is supported,
- # but after loading this flag should be treated as read only.
- self.use_pep517 = use_pep517
-
- # If config settings are provided, enforce PEP 517.
- if self.config_settings:
- if self.use_pep517 is False:
- logger.warning(
- "--no-use-pep517 ignored for %s "
- "because --config-settings are specified.",
- self,
- )
- self.use_pep517 = True
+ self.pep517_backend: BuildBackendHookCaller | None = None
# 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
+ self._archive_source: Path | None = None
def __str__(self) -> str:
if self.req:
@@ -214,7 +195,7 @@ def __str__(self) -> str:
s += f" in {location}"
if self.comes_from:
if isinstance(self.comes_from, str):
- comes_from: Optional[str] = self.comes_from
+ comes_from: str | None = self.comes_from
else:
comes_from = self.comes_from.from_path()
if comes_from:
@@ -240,15 +221,13 @@ def format_debug(self) -> str:
# Things that are valid for all kinds of requirements?
@property
- def name(self) -> Optional[str]:
+ def name(self) -> str | None:
if self.req is None:
return None
return self.req.name
@functools.cached_property
def supports_pyproject_editable(self) -> bool:
- if not self.use_pep517:
- return False
assert self.pep517_backend
with self.build_env:
runner = runner_with_spinner_message(
@@ -277,7 +256,7 @@ def is_pinned(self) -> bool:
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:
+ def match_markers(self, extras_requested: Iterable[str] | None = None) -> bool:
if not extras_requested:
# Provide an extra to safely evaluate the markers
# without matching any extra
@@ -326,13 +305,13 @@ def hashes(self, trust_internet: bool = True) -> Hashes:
good_hashes.setdefault(link.hash_name, []).append(link.hash)
return Hashes(good_hashes)
- def from_path(self) -> Optional[str]:
+ def from_path(self) -> str | None:
"""Format a nice indicator to show where this "comes from" """
if self.req is None:
return None
s = str(self.req)
if self.comes_from:
- comes_from: Optional[str]
+ comes_from: str | None
if isinstance(self.comes_from, str):
comes_from = self.comes_from
else:
@@ -489,13 +468,6 @@ def setup_py_path(self) -> str:
return setup_py
- @property
- def setup_cfg_path(self) -> str:
- assert self.source_dir, f"No source dir for {self}"
- setup_cfg = os.path.join(self.unpacked_source_directory, "setup.cfg")
-
- return setup_cfg
-
@property
def pyproject_toml_path(self) -> str:
assert self.source_dir, f"No source dir for {self}"
@@ -505,20 +477,12 @@ def load_pyproject_toml(self) -> None:
"""Load the pyproject.toml file.
After calling this routine, all of the attributes related to PEP 517
- processing for this requirement have been set. In particular, the
- use_pep517 attribute can be used to determine whether we should
- follow the PEP 517 or legacy (setup.py) code path.
+ processing for this requirement have been set.
"""
pyproject_toml_data = load_pyproject_toml(
- self.use_pep517, self.pyproject_toml_path, self.setup_py_path, str(self)
+ self.pyproject_toml_path, self.setup_py_path, str(self)
)
-
- if pyproject_toml_data is None:
- assert not self.config_settings
- self.use_pep517 = False
- return
-
- self.use_pep517 = True
+ assert pyproject_toml_data
requires, backend, check, backend_path = pyproject_toml_data
self.requirements_to_check = check
self.pyproject_requires = requires
@@ -529,23 +493,15 @@ def load_pyproject_toml(self) -> None:
backend_path=backend_path,
)
- def isolated_editable_sanity_check(self) -> None:
+ def editable_sanity_check(self) -> None:
"""Check that an editable requirement if valid for use with PEP 517/518.
- This verifies that an editable that has a pyproject.toml either supports PEP 660
- or as a setup.py or a setup.cfg
+ This verifies that an editable has a build backend that supports PEP 660.
"""
- if (
- self.editable
- and self.use_pep517
- and not self.supports_pyproject_editable
- and not os.path.isfile(self.setup_py_path)
- and not os.path.isfile(self.setup_cfg_path)
- ):
+ if self.editable and not self.supports_pyproject_editable:
raise InstallationError(
- f"Project {self} has a 'pyproject.toml' and its build "
- f"backend is missing the 'build_editable' hook. Since it does not "
- f"have a 'setup.py' nor a 'setup.cfg', "
+ f"Project {self} uses a build backend "
+ f"that is missing the 'build_editable' hook, so "
f"it cannot be installed in editable mode. "
f"Consider using a build backend that supports PEP 660."
)
@@ -559,30 +515,21 @@ def prepare_metadata(self) -> None:
assert self.source_dir, f"No source dir for {self}"
details = self.name or f"from {self.link}"
- if self.use_pep517:
- assert self.pep517_backend is not None
- if (
- self.editable
- and self.permit_editable_wheels
- and self.supports_pyproject_editable
- ):
- self.metadata_directory = generate_editable_metadata(
- build_env=self.build_env,
- backend=self.pep517_backend,
- details=details,
- )
- else:
- self.metadata_directory = generate_metadata(
- build_env=self.build_env,
- backend=self.pep517_backend,
- details=details,
- )
+ assert self.pep517_backend is not None
+ if (
+ self.editable
+ and self.permit_editable_wheels
+ and self.supports_pyproject_editable
+ ):
+ self.metadata_directory = generate_editable_metadata(
+ build_env=self.build_env,
+ backend=self.pep517_backend,
+ details=details,
+ )
else:
- self.metadata_directory = generate_metadata_legacy(
+ self.metadata_directory = generate_metadata(
build_env=self.build_env,
- setup_py_path=self.setup_py_path,
- source_dir=self.unpacked_source_directory,
- isolated=self.isolated,
+ backend=self.pep517_backend,
details=details,
)
@@ -601,8 +548,13 @@ def metadata(self) -> Any:
return self._metadata
+ def set_dist(self, distribution: BaseDistribution) -> None:
+ self._distribution = distribution
+
def get_dist(self) -> BaseDistribution:
- if self.metadata_directory:
+ if self._distribution is not None:
+ return self._distribution
+ elif 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
@@ -699,7 +651,7 @@ def update_editable(self) -> None:
# Top-level Actions
def uninstall(
self, auto_confirm: bool = False, verbose: bool = False
- ) -> Optional[UninstallPathSet]:
+ ) -> UninstallPathSet | None:
"""
Uninstall the distribution currently satisfying this requirement.
@@ -737,7 +689,7 @@ def _clean_zip_name(name: str, prefix: str) -> str:
name = _clean_zip_name(path, rootdir)
return self.req.name + "/" + name
- def archive(self, build_dir: Optional[str]) -> None:
+ def archive(self, build_dir: str | None) -> None:
"""Saves archive to provided build_dir.
Used for saving downloaded VCS requirements as part of `pip download`.
@@ -806,10 +758,9 @@ def archive(self, build_dir: Optional[str]) -> None:
def install(
self,
- global_options: Optional[Sequence[str]] = None,
- root: Optional[str] = None,
- home: Optional[str] = None,
- prefix: Optional[str] = None,
+ root: str | None = None,
+ home: str | None = None,
+ prefix: str | None = None,
warn_script_location: bool = True,
use_user_site: bool = False,
pycompile: bool = True,
@@ -824,43 +775,6 @@ def install(
prefix=prefix,
)
- 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.1",
- issue=11457,
- )
- if self.config_settings:
- logger.warning(
- "--config-settings ignored for legacy editable install of %s. "
- "Consider upgrading to a version of setuptools "
- "that supports PEP 660 (>= 64).",
- self,
- )
- install_editable_legacy(
- global_options=global_options if global_options is not None else [],
- prefix=prefix,
- home=home,
- use_user_site=use_user_site,
- name=self.req.name,
- setup_py_path=self.setup_py_path,
- isolated=self.isolated,
- build_env=self.build_env,
- unpacked_source_directory=self.unpacked_source_directory,
- )
- self.install_succeeded = True
- return
-
assert self.is_wheel
assert self.local_file_path
@@ -905,30 +819,10 @@ def check_invalid_constraint_type(req: InstallRequirement) -> str:
return problem
-def _has_option(options: Values, reqs: List[InstallRequirement], option: str) -> bool:
+def _has_option(options: Values, reqs: list[InstallRequirement], option: str) -> bool:
if getattr(options, option, None):
return True
for req in reqs:
if getattr(req, option, None):
return True
return False
-
-
-def check_legacy_setup_py_options(
- options: Values,
- reqs: List[InstallRequirement],
-) -> None:
- has_build_options = _has_option(options, reqs, "build_options")
- has_global_options = _has_option(options, reqs, "global_options")
- if has_build_options or has_global_options:
- deprecated(
- reason="--build-option and --global-option are deprecated.",
- issue=11859,
- replacement="to use --config-settings",
- gone_in=None,
- )
- logger.warning(
- "Implying --no-binary=:all: due to the presence of "
- "--build-option / --global-option. "
- )
- options.format_control.disallow_binaries()
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/req_set.py b/addons/source-python/packages/site-packages/pip/_internal/req/req_set.py
index ec7a6e07a..3451b24f2 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/req/req_set.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/req_set.py
@@ -1,6 +1,5 @@
import logging
from collections import OrderedDict
-from typing import Dict, List
from pip._vendor.packaging.utils import canonicalize_name
@@ -13,10 +12,10 @@ class RequirementSet:
def __init__(self, check_supported_wheels: bool = True) -> None:
"""Create a RequirementSet."""
- self.requirements: Dict[str, InstallRequirement] = OrderedDict()
+ self.requirements: dict[str, InstallRequirement] = OrderedDict()
self.check_supported_wheels = check_supported_wheels
- self.unnamed_requirements: List[InstallRequirement] = []
+ self.unnamed_requirements: list[InstallRequirement] = []
def __str__(self) -> str:
requirements = sorted(
@@ -65,11 +64,11 @@ def get_requirement(self, name: str) -> InstallRequirement:
raise KeyError(f"No project with the name {name!r}")
@property
- def all_requirements(self) -> List[InstallRequirement]:
+ def all_requirements(self) -> list[InstallRequirement]:
return self.unnamed_requirements + list(self.requirements.values())
@property
- def requirements_to_install(self) -> List[InstallRequirement]:
+ def requirements_to_install(self) -> list[InstallRequirement]:
"""Return the list of requirements that need to be installed.
TODO remove this property together with the legacy resolver, since the new
diff --git a/addons/source-python/packages/site-packages/pip/_internal/req/req_uninstall.py b/addons/source-python/packages/site-packages/pip/_internal/req/req_uninstall.py
index 26df20844..3f3dde2fd 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/req/req_uninstall.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/req/req_uninstall.py
@@ -1,9 +1,12 @@
+from __future__ import annotations
+
import functools
import os
import sys
import sysconfig
+from collections.abc import Generator, Iterable
from importlib.util import cache_from_source
-from typing import Any, Callable, Dict, Generator, Iterable, List, Optional, Set, Tuple
+from typing import Any, Callable
from pip._internal.exceptions import LegacyDistutilsInstall, UninstallMissingRecord
from pip._internal.locations import get_bin_prefix, get_bin_user
@@ -38,11 +41,11 @@ 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]:
- seen: Set[Any] = set()
+ seen: set[Any] = set()
for item in fn(*args, **kw):
if item not in seen:
seen.add(item)
@@ -85,14 +88,14 @@ def uninstallation_paths(dist: BaseDistribution) -> Generator[str, None, None]:
yield path
-def compact(paths: Iterable[str]) -> Set[str]:
+def compact(paths: Iterable[str]) -> set[str]:
"""Compact a path set to contain the minimal number of paths
necessary to contain all paths in the set. If /a/path/ and
/a/path/to/a/file.txt are both in the set, leave only the
shorter path."""
sep = os.path.sep
- short_paths: Set[str] = set()
+ short_paths: set[str] = set()
for path in sorted(paths, key=len):
should_skip = any(
path.startswith(shortpath.rstrip("*"))
@@ -104,7 +107,7 @@ def compact(paths: Iterable[str]) -> Set[str]:
return short_paths
-def compress_for_rename(paths: Iterable[str]) -> Set[str]:
+def compress_for_rename(paths: Iterable[str]) -> set[str]:
"""Returns a set containing the paths that need to be renamed.
This set may include directories when the original sequence of paths
@@ -113,7 +116,7 @@ def compress_for_rename(paths: Iterable[str]) -> Set[str]:
case_map = {os.path.normcase(p): p for p in paths}
remaining = set(case_map)
unchecked = sorted({os.path.split(p)[0] for p in case_map.values()}, key=len)
- wildcards: Set[str] = set()
+ wildcards: set[str] = set()
def norm_join(*a: str) -> str:
return os.path.normcase(os.path.join(*a))
@@ -123,8 +126,8 @@ def norm_join(*a: str) -> str:
# This directory has already been handled.
continue
- all_files: Set[str] = set()
- all_subdirs: Set[str] = set()
+ all_files: set[str] = set()
+ all_subdirs: set[str] = set()
for dirname, subdirs, files in os.walk(root):
all_subdirs.update(norm_join(root, dirname, d) for d in subdirs)
all_files.update(norm_join(root, dirname, f) for f in files)
@@ -138,7 +141,7 @@ def norm_join(*a: str) -> str:
return set(map(case_map.__getitem__, remaining)) | wildcards
-def compress_for_output_listing(paths: Iterable[str]) -> Tuple[Set[str], Set[str]]:
+def compress_for_output_listing(paths: Iterable[str]) -> tuple[set[str], set[str]]:
"""Returns a tuple of 2 sets of which paths to display to user
The first set contains paths that would be deleted. Files of a package
@@ -194,10 +197,10 @@ class StashedUninstallPathSet:
def __init__(self) -> None:
# Mapping from source file root to [Adjacent]TempDirectory
# for files under that directory.
- self._save_dirs: Dict[str, TempDirectory] = {}
+ self._save_dirs: dict[str, TempDirectory] = {}
# (old path, new path) tuples for each move that may need
# to be undone.
- self._moves: List[Tuple[str, str]] = []
+ self._moves: list[tuple[str, str]] = []
def _get_directory_stash(self, path: str) -> str:
"""Stashes a directory.
@@ -297,9 +300,9 @@ class UninstallPathSet:
requirement."""
def __init__(self, dist: BaseDistribution) -> None:
- self._paths: Set[str] = set()
- self._refuse: Set[str] = set()
- self._pth: Dict[str, UninstallPthEntries] = {}
+ self._paths: set[str] = set()
+ self._refuse: set[str] = set()
+ self._pth: dict[str, UninstallPthEntries] = {}
self._dist = dist
self._moved_paths = StashedUninstallPathSet()
# Create local cache of normalize_path results. Creating an UninstallPathSet
@@ -421,7 +424,7 @@ def commit(self) -> None:
self._moved_paths.commit()
@classmethod
- def from_dist(cls, dist: BaseDistribution) -> "UninstallPathSet":
+ def from_dist(cls, dist: BaseDistribution) -> UninstallPathSet:
dist_location = dist.location
info_location = dist.info_location
if dist_location is None:
@@ -505,10 +508,13 @@ def from_dist(cls, dist: BaseDistribution) -> "UninstallPathSet":
# package installed by easy_install
# We cannot match on dist.egg_name because it can slightly vary
# i.e. setuptools-0.6c11-py2.6.egg vs setuptools-0.6rc11-py2.6.egg
- paths_to_remove.add(dist_location)
- easy_install_egg = os.path.split(dist_location)[1]
+ # XXX We use normalized_dist_location because dist_location my contain
+ # a trailing / if the distribution is a zipped egg
+ # (which is not a directory).
+ paths_to_remove.add(normalized_dist_location)
+ easy_install_egg = os.path.split(normalized_dist_location)[1]
easy_install_pth = os.path.join(
- os.path.dirname(dist_location),
+ os.path.dirname(normalized_dist_location),
"easy-install.pth",
)
paths_to_remove.add_pth(easy_install_pth, "./" + easy_install_egg)
@@ -578,8 +584,8 @@ def iter_scripts_to_remove(
class UninstallPthEntries:
def __init__(self, pth_file: str) -> None:
self.file = pth_file
- self.entries: Set[str] = set()
- self._saved_lines: Optional[List[bytes]] = None
+ self.entries: set[str] = set()
+ self._saved_lines: list[bytes] | None = None
def add(self, entry: str) -> None:
entry = os.path.normcase(entry)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/base.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/base.py
index 42dade18c..5ec4d96aa 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/base.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/base.py
@@ -1,4 +1,4 @@
-from typing import Callable, List, Optional
+from typing import Callable, Optional
from pip._internal.req.req_install import InstallRequirement
from pip._internal.req.req_set import RequirementSet
@@ -10,11 +10,11 @@
class BaseResolver:
def resolve(
- self, root_reqs: List[InstallRequirement], check_supported_wheels: bool
+ self, root_reqs: list[InstallRequirement], check_supported_wheels: bool
) -> RequirementSet:
raise NotImplementedError()
def get_installation_order(
self, req_set: RequirementSet
- ) -> List[InstallRequirement]:
+ ) -> list[InstallRequirement]:
raise NotImplementedError()
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/legacy/resolver.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/legacy/resolver.py
index 1dd0d7041..33a4fdc3b 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/legacy/resolver.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/legacy/resolver.py
@@ -10,11 +10,14 @@
a. "first found, wins" (where the order is breadth first)
"""
+from __future__ import annotations
+
import logging
import sys
from collections import defaultdict
+from collections.abc import Iterable
from itertools import chain
-from typing import DefaultDict, Iterable, List, Optional, Set, Tuple
+from typing import Optional
from pip._vendor.packaging import specifiers
from pip._vendor.packaging.requirements import Requirement
@@ -49,12 +52,12 @@
logger = logging.getLogger(__name__)
-DiscoveredDependencies = DefaultDict[Optional[str], List[InstallRequirement]]
+DiscoveredDependencies = defaultdict[Optional[str], list[InstallRequirement]]
def _check_dist_requires_python(
dist: BaseDistribution,
- version_info: Tuple[int, int, int],
+ version_info: tuple[int, int, int],
ignore_requires_python: bool = False,
) -> None:
"""
@@ -117,7 +120,7 @@ def __init__(
self,
preparer: RequirementPreparer,
finder: PackageFinder,
- wheel_cache: Optional[WheelCache],
+ wheel_cache: WheelCache | None,
make_install_req: InstallRequirementProvider,
use_user_site: bool,
ignore_dependencies: bool,
@@ -125,7 +128,7 @@ def __init__(
ignore_requires_python: bool,
force_reinstall: bool,
upgrade_strategy: str,
- py_version_info: Optional[Tuple[int, ...]] = None,
+ py_version_info: tuple[int, ...] | None = None,
) -> None:
super().__init__()
assert upgrade_strategy in self._allowed_strategies
@@ -152,7 +155,7 @@ def __init__(
self._discovered_dependencies: DiscoveredDependencies = defaultdict(list)
def resolve(
- self, root_reqs: List[InstallRequirement], check_supported_wheels: bool
+ self, root_reqs: list[InstallRequirement], check_supported_wheels: bool
) -> RequirementSet:
"""Resolve what operations need to be done
@@ -174,7 +177,7 @@ def resolve(
# exceptions cannot be checked ahead of time, because
# _populate_link() needs to be called before we can make decisions
# based on link type.
- discovered_reqs: List[InstallRequirement] = []
+ discovered_reqs: list[InstallRequirement] = []
hash_errors = HashErrors()
for req in chain(requirement_set.all_requirements, discovered_reqs):
try:
@@ -192,9 +195,9 @@ def _add_requirement_to_set(
self,
requirement_set: RequirementSet,
install_req: InstallRequirement,
- parent_req_name: Optional[str] = None,
- extras_requested: Optional[Iterable[str]] = None,
- ) -> Tuple[List[InstallRequirement], Optional[InstallRequirement]]:
+ parent_req_name: str | None = None,
+ extras_requested: Iterable[str] | None = None,
+ ) -> tuple[list[InstallRequirement], InstallRequirement | None]:
"""Add install_req as a requirement to install.
:param parent_req_name: The name of the requirement that needed this
@@ -242,8 +245,8 @@ def _add_requirement_to_set(
return [install_req], None
try:
- existing_req: Optional[InstallRequirement] = (
- requirement_set.get_requirement(install_req.name)
+ existing_req: InstallRequirement | None = requirement_set.get_requirement(
+ install_req.name
)
except KeyError:
existing_req = None
@@ -323,9 +326,7 @@ def _set_req_to_reinstall(self, req: InstallRequirement) -> None:
req.should_reinstall = True
req.satisfied_by = None
- def _check_skip_installed(
- self, req_to_install: InstallRequirement
- ) -> Optional[str]:
+ def _check_skip_installed(self, req_to_install: InstallRequirement) -> str | None:
"""Check if req_to_install should be skipped.
This will check if the req is installed, and whether we should upgrade
@@ -377,7 +378,7 @@ def _check_skip_installed(
self._set_req_to_reinstall(req_to_install)
return None
- def _find_requirement_link(self, req: InstallRequirement) -> Optional[Link]:
+ def _find_requirement_link(self, req: InstallRequirement) -> Link | None:
upgrade = self._is_upgrade_allowed(req)
best_candidate = self.finder.find_requirement(req, upgrade)
if not best_candidate:
@@ -488,7 +489,7 @@ def _resolve_one(
self,
requirement_set: RequirementSet,
req_to_install: InstallRequirement,
- ) -> List[InstallRequirement]:
+ ) -> list[InstallRequirement]:
"""Prepare a single requirements file.
:return: A list of additional InstallRequirements to also install.
@@ -511,7 +512,7 @@ def _resolve_one(
ignore_requires_python=self.ignore_requires_python,
)
- more_reqs: List[InstallRequirement] = []
+ more_reqs: list[InstallRequirement] = []
def add_req(subreq: Requirement, extras_requested: Iterable[str]) -> None:
# This idiosyncratically converts the Requirement to str and let
@@ -569,7 +570,7 @@ def add_req(subreq: Requirement, extras_requested: Iterable[str]) -> None:
def get_installation_order(
self, req_set: RequirementSet
- ) -> List[InstallRequirement]:
+ ) -> list[InstallRequirement]:
"""Create the installation order.
The installation order is topological - requirements are installed
@@ -580,7 +581,7 @@ def get_installation_order(
# installs the user specified things in the order given, except when
# dependencies must come earlier to achieve topological order.
order = []
- ordered_reqs: Set[InstallRequirement] = set()
+ ordered_reqs: set[InstallRequirement] = set()
def schedule(req: InstallRequirement) -> None:
if req.satisfied_by or req in ordered_reqs:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/base.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/base.py
index 0f31dc9b3..03877b6c2 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/base.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/base.py
@@ -1,5 +1,8 @@
+from __future__ import annotations
+
+from collections.abc import Iterable
from dataclasses import dataclass
-from typing import FrozenSet, Iterable, Optional, Tuple
+from typing import Optional
from pip._vendor.packaging.specifiers import SpecifierSet
from pip._vendor.packaging.utils import NormalizedName
@@ -9,10 +12,10 @@
from pip._internal.req.req_install import InstallRequirement
from pip._internal.utils.hashes import Hashes
-CandidateLookup = Tuple[Optional["Candidate"], Optional[InstallRequirement]]
+CandidateLookup = tuple[Optional["Candidate"], Optional[InstallRequirement]]
-def format_name(project: NormalizedName, extras: FrozenSet[NormalizedName]) -> str:
+def format_name(project: NormalizedName, extras: frozenset[NormalizedName]) -> str:
if not extras:
return project
extras_expr = ",".join(sorted(extras))
@@ -23,21 +26,21 @@ def format_name(project: NormalizedName, extras: FrozenSet[NormalizedName]) -> s
class Constraint:
specifier: SpecifierSet
hashes: Hashes
- links: FrozenSet[Link]
+ links: frozenset[Link]
@classmethod
- def empty(cls) -> "Constraint":
+ def empty(cls) -> Constraint:
return Constraint(SpecifierSet(), Hashes(), frozenset())
@classmethod
- def from_ireq(cls, ireq: InstallRequirement) -> "Constraint":
+ def from_ireq(cls, ireq: InstallRequirement) -> Constraint:
links = frozenset([ireq.link]) if ireq.link else frozenset()
return Constraint(ireq.specifier, ireq.hashes(trust_internet=False), links)
def __bool__(self) -> bool:
return bool(self.specifier) or bool(self.hashes) or bool(self.links)
- def __and__(self, other: InstallRequirement) -> "Constraint":
+ def __and__(self, other: InstallRequirement) -> Constraint:
if not isinstance(other, InstallRequirement):
return NotImplemented
specifier = self.specifier & other.specifier
@@ -47,7 +50,7 @@ def __and__(self, other: InstallRequirement) -> "Constraint":
links = links.union([other.link])
return Constraint(specifier, hashes, links)
- def is_satisfied_by(self, candidate: "Candidate") -> bool:
+ def is_satisfied_by(self, candidate: Candidate) -> bool:
# Reject if there are any mismatched URL constraints on this package.
if self.links and not all(_match_link(link, candidate) for link in self.links):
return False
@@ -77,7 +80,7 @@ def name(self) -> str:
"""
raise NotImplementedError("Subclass should override")
- def is_satisfied_by(self, candidate: "Candidate") -> bool:
+ def is_satisfied_by(self, candidate: Candidate) -> bool:
return False
def get_candidate_lookup(self) -> CandidateLookup:
@@ -87,7 +90,7 @@ def format_for_error(self) -> str:
raise NotImplementedError("Subclass should override")
-def _match_link(link: Link, candidate: "Candidate") -> bool:
+def _match_link(link: Link, candidate: Candidate) -> bool:
if candidate.source_link:
return links_equivalent(link, candidate.source_link)
return False
@@ -126,13 +129,13 @@ def is_editable(self) -> bool:
raise NotImplementedError("Override in subclass")
@property
- def source_link(self) -> Optional[Link]:
+ def source_link(self) -> Link | None:
raise NotImplementedError("Override in subclass")
- def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
+ def iter_dependencies(self, with_requires: bool) -> Iterable[Requirement | None]:
raise NotImplementedError("Override in subclass")
- def get_install_requirement(self) -> Optional[InstallRequirement]:
+ def get_install_requirement(self) -> InstallRequirement | None:
raise NotImplementedError("Override in subclass")
def format_for_error(self) -> str:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/candidates.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/candidates.py
index 6617644fe..aa126d488 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/candidates.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/candidates.py
@@ -1,12 +1,16 @@
+from __future__ import annotations
+
import logging
import sys
-from typing import TYPE_CHECKING, Any, FrozenSet, Iterable, Optional, Tuple, Union, cast
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, Any, 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
from pip._internal.exceptions import (
+ FailedToPrepareCandidate,
HashError,
InstallationSubprocessError,
InvalidInstalledPackage,
@@ -41,7 +45,7 @@
REQUIRES_PYTHON_IDENTIFIER = cast(NormalizedName, "")
-def as_base_candidate(candidate: Candidate) -> Optional[BaseCandidate]:
+def as_base_candidate(candidate: Candidate) -> BaseCandidate | None:
"""The runtime version of BaseCandidate."""
base_candidate_classes = (
AlreadyInstalledCandidate,
@@ -65,10 +69,8 @@ def make_install_req_from_link(
line,
user_supplied=template.user_supplied,
comes_from=template.comes_from,
- use_pep517=template.use_pep517,
isolated=template.isolated,
constraint=template.constraint,
- global_options=template.global_options,
hash_options=template.hash_options,
config_settings=template.config_settings,
)
@@ -82,15 +84,17 @@ def make_install_req_from_editable(
link: Link, template: InstallRequirement
) -> InstallRequirement:
assert template.editable, "template not editable"
+ if template.name:
+ req_string = f"{template.name} @ {link.url}"
+ else:
+ req_string = link.url
ireq = install_req_from_editable(
- link.url,
+ req_string,
user_supplied=template.user_supplied,
comes_from=template.comes_from,
- use_pep517=template.use_pep517,
isolated=template.isolated,
constraint=template.constraint,
permit_editable_wheels=template.permit_editable_wheels,
- global_options=template.global_options,
hash_options=template.hash_options,
config_settings=template.config_settings,
)
@@ -111,10 +115,8 @@ def _make_install_req_from_dist(
line,
user_supplied=template.user_supplied,
comes_from=template.comes_from,
- use_pep517=template.use_pep517,
isolated=template.isolated,
constraint=template.constraint,
- global_options=template.global_options,
hash_options=template.hash_options,
config_settings=template.config_settings,
)
@@ -146,9 +148,9 @@ def __init__(
link: Link,
source_link: Link,
ireq: InstallRequirement,
- factory: "Factory",
- name: Optional[NormalizedName] = None,
- version: Optional[Version] = None,
+ factory: Factory,
+ name: NormalizedName | None = None,
+ version: Version | None = None,
) -> None:
self._link = link
self._source_link = source_link
@@ -157,7 +159,7 @@ def __init__(
self._name = name
self._version = version
self.dist = self._prepare()
- self._hash: Optional[int] = None
+ self._hash: int | None = None
def __str__(self) -> str:
return f"{self.name} {self.version}"
@@ -178,7 +180,7 @@ def __eq__(self, other: Any) -> bool:
return False
@property
- def source_link(self) -> Optional[Link]:
+ def source_link(self) -> Link | None:
return self._source_link
@property
@@ -241,20 +243,32 @@ def _prepare(self) -> BaseDistribution:
e.req = self._ireq
raise
except InstallationSubprocessError as exc:
- # The output has been presented already, so don't duplicate it.
- exc.context = "See above for output."
- raise
+ if isinstance(self._ireq.comes_from, InstallRequirement):
+ request_chain = self._ireq.comes_from.from_path()
+ else:
+ request_chain = self._ireq.comes_from
+
+ if request_chain is None:
+ request_chain = "directly requested"
+
+ raise FailedToPrepareCandidate(
+ package_name=self._ireq.name or str(self._link),
+ requirement_chain=request_chain,
+ failed_step=exc.command_description,
+ )
self._check_metadata_consistency(dist)
return dist
- def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
+ def iter_dependencies(self, with_requires: bool) -> Iterable[Requirement | None]:
+ # 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]:
+ def get_install_requirement(self) -> InstallRequirement | None:
return self._ireq
@@ -265,9 +279,9 @@ def __init__(
self,
link: Link,
template: InstallRequirement,
- factory: "Factory",
- name: Optional[NormalizedName] = None,
- version: Optional[Version] = None,
+ factory: Factory,
+ name: NormalizedName | None = None,
+ version: Version | None = None,
) -> None:
source_link = link
cache_entry = factory.get_wheel_cache_entry(source_link, name)
@@ -278,7 +292,7 @@ def __init__(
assert ireq.link == link
if ireq.link.is_wheel and not ireq.link.is_file:
wheel = Wheel(ireq.link.filename)
- wheel_name = canonicalize_name(wheel.name)
+ wheel_name = wheel.name
assert name == wheel_name, f"{name!r} != {wheel_name!r} for wheel"
# Version may not be present for PEP 508 direct URLs
if version is not None:
@@ -322,9 +336,9 @@ def __init__(
self,
link: Link,
template: InstallRequirement,
- factory: "Factory",
- name: Optional[NormalizedName] = None,
- version: Optional[Version] = None,
+ factory: Factory,
+ name: NormalizedName | None = None,
+ version: Version | None = None,
) -> None:
super().__init__(
link=link,
@@ -347,7 +361,7 @@ def __init__(
self,
dist: BaseDistribution,
template: InstallRequirement,
- factory: "Factory",
+ factory: Factory,
) -> None:
self.dist = dist
self._ireq = _make_install_req_from_dist(dist, template)
@@ -396,7 +410,7 @@ def is_editable(self) -> bool:
def format_for_error(self) -> str:
return f"{self.name} {self.version} (Installed)"
- def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
+ def iter_dependencies(self, with_requires: bool) -> Iterable[Requirement | None]:
if not with_requires:
return
@@ -406,7 +420,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen
except InvalidRequirement as exc:
raise InvalidInstalledPackage(dist=self.dist, invalid_exc=exc) from None
- def get_install_requirement(self) -> Optional[InstallRequirement]:
+ def get_install_requirement(self) -> InstallRequirement | None:
return None
@@ -438,9 +452,9 @@ class ExtrasCandidate(Candidate):
def __init__(
self,
base: BaseCandidate,
- extras: FrozenSet[str],
+ extras: frozenset[str],
*,
- comes_from: Optional[InstallRequirement] = None,
+ comes_from: InstallRequirement | None = None,
) -> None:
"""
:param comes_from: the InstallRequirement that led to this candidate if it
@@ -496,10 +510,10 @@ def is_editable(self) -> bool:
return self.base.is_editable
@property
- def source_link(self) -> Optional[Link]:
+ def source_link(self) -> Link | None:
return self.base.source_link
- def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
+ def iter_dependencies(self, with_requires: bool) -> Iterable[Requirement | None]:
factory = self.base._factory
# Add a dependency on the exact base
@@ -527,7 +541,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen
valid_extras,
)
- def get_install_requirement(self) -> Optional[InstallRequirement]:
+ def get_install_requirement(self) -> InstallRequirement | None:
# We don't return anything here, because we always
# depend on the base candidate, and we'll get the
# install requirement from that.
@@ -538,7 +552,7 @@ class RequiresPythonCandidate(Candidate):
is_installed = False
source_link = None
- def __init__(self, py_version_info: Optional[Tuple[int, ...]]) -> None:
+ def __init__(self, py_version_info: tuple[int, ...] | None) -> None:
if py_version_info is not None:
version_info = normalize_version_info(py_version_info)
else:
@@ -552,6 +566,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
@@ -567,8 +584,8 @@ def version(self) -> Version:
def format_for_error(self) -> str:
return f"Python {self.version}"
- def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
+ def iter_dependencies(self, with_requires: bool) -> Iterable[Requirement | None]:
return ()
- def get_install_requirement(self) -> Optional[InstallRequirement]:
+ def get_install_requirement(self) -> InstallRequirement | None:
return None
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/factory.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/factory.py
index 6c273eb88..ede3e6b2b 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/factory.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/factory.py
@@ -1,21 +1,14 @@
+from __future__ import annotations
+
import contextlib
import functools
import logging
+from collections.abc import Iterable, Iterator, Mapping, Sequence
from typing import (
TYPE_CHECKING,
Callable,
- Dict,
- FrozenSet,
- Iterable,
- Iterator,
- List,
- Mapping,
NamedTuple,
- Optional,
Protocol,
- Sequence,
- Set,
- Tuple,
TypeVar,
cast,
)
@@ -84,13 +77,13 @@ class ConflictCause(Protocol):
logger = logging.getLogger(__name__)
C = TypeVar("C")
-Cache = Dict[Link, C]
+Cache = dict[Link, C]
class CollectedRootRequirements(NamedTuple):
- requirements: List[Requirement]
- constraints: Dict[str, Constraint]
- user_requested: Dict[str, int]
+ requirements: list[Requirement]
+ constraints: dict[str, Constraint]
+ user_requested: dict[str, int]
class Factory:
@@ -99,12 +92,12 @@ def __init__(
finder: PackageFinder,
preparer: RequirementPreparer,
make_install_req: InstallRequirementProvider,
- wheel_cache: Optional[WheelCache],
+ wheel_cache: WheelCache | None,
use_user_site: bool,
force_reinstall: bool,
ignore_installed: bool,
ignore_requires_python: bool,
- py_version_info: Optional[Tuple[int, ...]] = None,
+ py_version_info: tuple[int, ...] | None = None,
) -> None:
self._finder = finder
self.preparer = preparer
@@ -118,9 +111,9 @@ def __init__(
self._build_failures: Cache[InstallationError] = {}
self._link_candidate_cache: Cache[LinkCandidate] = {}
self._editable_candidate_cache: Cache[EditableCandidate] = {}
- self._installed_candidate_cache: Dict[str, AlreadyInstalledCandidate] = {}
- self._extras_candidate_cache: Dict[
- Tuple[int, FrozenSet[NormalizedName]], ExtrasCandidate
+ self._installed_candidate_cache: dict[str, AlreadyInstalledCandidate] = {}
+ self._extras_candidate_cache: dict[
+ tuple[int, frozenset[NormalizedName]], ExtrasCandidate
] = {}
self._supported_tags_cache = get_supported()
@@ -149,9 +142,9 @@ def _fail_if_link_is_unsupported_wheel(self, link: Link) -> None:
def _make_extras_candidate(
self,
base: BaseCandidate,
- extras: FrozenSet[str],
+ extras: frozenset[str],
*,
- comes_from: Optional[InstallRequirement] = None,
+ comes_from: InstallRequirement | None = None,
) -> ExtrasCandidate:
cache_key = (id(base), frozenset(canonicalize_name(e) for e in extras))
try:
@@ -164,7 +157,7 @@ def _make_extras_candidate(
def _make_candidate_from_dist(
self,
dist: BaseDistribution,
- extras: FrozenSet[str],
+ extras: frozenset[str],
template: InstallRequirement,
) -> Candidate:
try:
@@ -179,12 +172,12 @@ def _make_candidate_from_dist(
def _make_candidate_from_link(
self,
link: Link,
- extras: FrozenSet[str],
+ extras: frozenset[str],
template: InstallRequirement,
- name: Optional[NormalizedName],
- version: Optional[Version],
- ) -> Optional[Candidate]:
- base: Optional[BaseCandidate] = self._make_base_candidate_from_link(
+ name: NormalizedName | None,
+ version: Version | None,
+ ) -> Candidate | None:
+ base: BaseCandidate | None = self._make_base_candidate_from_link(
link, template, name, version
)
if not extras or base is None:
@@ -195,9 +188,9 @@ def _make_base_candidate_from_link(
self,
link: Link,
template: InstallRequirement,
- name: Optional[NormalizedName],
- version: Optional[Version],
- ) -> Optional[BaseCandidate]:
+ name: NormalizedName | None,
+ version: Version | None,
+ ) -> BaseCandidate | None:
# TODO: Check already installed candidate, and use it if the link and
# editable flag match.
@@ -254,7 +247,7 @@ def _iter_found_candidates(
specifier: SpecifierSet,
hashes: Hashes,
prefers_installed: bool,
- incompatible_ids: Set[int],
+ incompatible_ids: set[int],
) -> Iterable[Candidate]:
if not ireqs:
return ()
@@ -267,14 +260,14 @@ 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[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(ireq.extras)
- def _get_installed_candidate() -> Optional[Candidate]:
+ def _get_installed_candidate() -> Candidate | None:
"""Get the candidate for the currently-installed version."""
# If --force-reinstall is set, we want the version from the index
# instead, so we "pretend" there is nothing installed.
@@ -353,7 +346,7 @@ def is_pinned(specifier: SpecifierSet) -> bool:
def _iter_explicit_candidates_from_base(
self,
base_requirements: Iterable[Requirement],
- extras: FrozenSet[str],
+ extras: frozenset[str],
) -> Iterator[Candidate]:
"""Produce explicit candidates from the base given an extra-ed package.
@@ -404,8 +397,8 @@ def find_candidates(
is_satisfied_by: Callable[[Requirement, Candidate], bool],
) -> Iterable[Candidate]:
# Collect basic lookup information from the requirements.
- explicit_candidates: Set[Candidate] = set()
- ireqs: List[InstallRequirement] = []
+ explicit_candidates: set[Candidate] = set()
+ ireqs: list[InstallRequirement] = []
for req in requirements[identifier]:
cand, ireq = req.get_candidate_lookup()
if cand is not None:
@@ -524,7 +517,7 @@ def _make_requirements_from_install_req(
)
def collect_root_requirements(
- self, root_ireqs: List[InstallRequirement]
+ self, root_ireqs: list[InstallRequirement]
) -> CollectedRootRequirements:
collected = CollectedRootRequirements([], {}, {})
for i, ireq in enumerate(root_ireqs):
@@ -573,7 +566,7 @@ def make_requirement_from_candidate(
def make_requirements_from_spec(
self,
specifier: str,
- comes_from: Optional[InstallRequirement],
+ comes_from: InstallRequirement | None,
requested_extras: Iterable[str] = (),
) -> Iterator[Requirement]:
"""
@@ -591,7 +584,7 @@ def make_requirements_from_spec(
def make_requires_python_requirement(
self,
specifier: SpecifierSet,
- ) -> Optional[Requirement]:
+ ) -> Requirement | None:
if self._ignore_requires_python:
return None
# Don't bother creating a dependency for an empty Requires-Python.
@@ -599,9 +592,7 @@ def make_requires_python_requirement(
return None
return RequiresPythonRequirement(specifier, self._python_candidate)
- def get_wheel_cache_entry(
- self, link: Link, name: Optional[str]
- ) -> Optional[CacheEntry]:
+ def get_wheel_cache_entry(self, link: Link, name: str | None) -> CacheEntry | None:
"""Look up the link in the wheel cache.
If ``preparer.require_hashes`` is True, don't use the wheel cache,
@@ -618,7 +609,7 @@ def get_wheel_cache_entry(
supported_tags=self._supported_tags_cache,
)
- def get_dist_to_uninstall(self, candidate: Candidate) -> Optional[BaseDistribution]:
+ def get_dist_to_uninstall(self, candidate: Candidate) -> BaseDistribution | None:
# TODO: Are there more cases this needs to return True? Editable?
dist = self._installed_dists.get(candidate.project_name)
if dist is None: # Not installed, no uninstallation required.
@@ -647,7 +638,7 @@ def get_dist_to_uninstall(self, candidate: Candidate) -> Optional[BaseDistributi
return None
def _report_requires_python_error(
- self, causes: Sequence["ConflictCause"]
+ self, causes: Sequence[ConflictCause]
) -> UnsupportedPythonVersion:
assert causes, "Requires-Python error reported with no cause"
@@ -669,7 +660,7 @@ def _report_requires_python_error(
return UnsupportedPythonVersion(message)
def _report_single_requirement_conflict(
- self, req: Requirement, parent: Optional[Candidate]
+ self, req: Requirement, parent: Candidate | None
) -> DistributionNotFound:
if parent is None:
req_disp = str(req)
@@ -679,8 +670,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[Version] = set()
- yanked_versions_set: Set[Version] = 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:
@@ -704,9 +695,20 @@ def _report_single_requirement_conflict(
"version: %s",
"; ".join(skipped_by_requires_python) or "none",
)
+
+ # Check if only final releases are allowed for this package
+ version_type = "version"
+ if self._finder.release_control is not None:
+ allows_pre = self._finder.release_control.allows_prereleases(
+ canonicalize_name(req.project_name)
+ )
+ if allows_pre is False:
+ version_type = "final version"
+
logger.critical(
- "Could not find a version that satisfies the requirement %s "
+ "Could not find a %s that satisfies the requirement %s "
"(from versions: %s)",
+ version_type,
req_disp,
", ".join(versions) or "none",
)
@@ -720,10 +722,25 @@ def _report_single_requirement_conflict(
return DistributionNotFound(f"No matching distribution found for {req}")
+ def _has_any_candidates(self, project_name: str) -> bool:
+ """
+ Check if there are any candidates available for the project name.
+ """
+ return any(
+ self.find_candidates(
+ project_name,
+ requirements={project_name: []},
+ incompatibilities={},
+ constraint=Constraint.empty(),
+ prefers_installed=True,
+ is_satisfied_by=lambda r, c: True,
+ )
+ )
+
def get_installation_error(
self,
- e: "ResolutionImpossible[Requirement, Candidate]",
- constraints: Dict[str, Constraint],
+ e: ResolutionImpossible[Requirement, Candidate],
+ constraints: dict[str, Constraint],
) -> InstallationError:
assert e.causes, "Installation error reported with no cause"
@@ -748,7 +765,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)
@@ -756,7 +773,7 @@ def get_installation_error(
# satisfied at once.
# A couple of formatting helpers
- def text_join(parts: List[str]) -> str:
+ def text_join(parts: list[str]) -> str:
if len(parts) == 1:
return parts[0]
@@ -805,6 +822,22 @@ def describe_trigger(parent: Candidate) -> str:
spec = constraints[key].specifier
msg += f"\n The user requested (constraint) {key}{spec}"
+ # Check for causes that had no candidates
+ causes = set()
+ for req, _ in e.causes:
+ causes.add(req.name)
+
+ no_candidates = {c for c in causes if not self._has_any_candidates(c)}
+ if no_candidates:
+ msg = (
+ msg
+ + "\n\n"
+ + "Additionally, some packages in these conflicts have no "
+ + "matching distributions available for your environment:"
+ + "\n "
+ + "\n ".join(sorted(no_candidates))
+ )
+
msg = (
msg
+ "\n\n"
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/found_candidates.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/found_candidates.py
index a1d57e0f4..f60653d21 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/found_candidates.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/found_candidates.py
@@ -8,10 +8,11 @@
something.
"""
-import functools
+from __future__ import annotations
+
import logging
-from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any, Callable, Iterator, Optional, Set, Tuple
+from collections.abc import Iterator, Sequence
+from typing import Any, Callable, Optional
from pip._vendor.packaging.version import _BaseVersion
@@ -21,22 +22,7 @@
logger = logging.getLogger(__name__)
-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
+IndexCandidateInfo = tuple[_BaseVersion, Callable[[], Optional[Candidate]]]
def _iter_built(infos: Iterator[IndexCandidateInfo]) -> Iterator[Candidate]:
@@ -45,7 +31,7 @@ def _iter_built(infos: Iterator[IndexCandidateInfo]) -> Iterator[Candidate]:
This iterator is used when the package is not already installed. Candidates
from index come later in their normal ordering.
"""
- versions_found: Set[_BaseVersion] = set()
+ versions_found: set[_BaseVersion] = set()
for version, func in infos:
if version in versions_found:
continue
@@ -81,7 +67,7 @@ def _iter_built_with_prepended(
normal ordering, except skipped when the version is already installed.
"""
yield installed
- versions_found: Set[_BaseVersion] = {installed.version}
+ versions_found: set[_BaseVersion] = {installed.version}
for version, func in infos:
if version in versions_found:
continue
@@ -105,7 +91,7 @@ def _iter_built_with_inserted(
the installed candidate exactly once before we start yielding older or
equivalent candidates, or after all other candidates if they are all newer.
"""
- versions_found: Set[_BaseVersion] = set()
+ versions_found: set[_BaseVersion] = set()
for version, func in infos:
if version in versions_found:
continue
@@ -124,7 +110,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
@@ -136,14 +122,15 @@ class FoundCandidates(SequenceCandidate):
def __init__(
self,
get_infos: Callable[[], Iterator[IndexCandidateInfo]],
- installed: Optional[Candidate],
+ installed: Candidate | None,
prefers_installed: bool,
- incompatible_ids: Set[int],
+ incompatible_ids: set[int],
):
self._get_infos = get_infos
self._installed = installed
self._prefers_installed = prefers_installed
self._incompatible_ids = incompatible_ids
+ self._bool: bool | None = None
def __getitem__(self, index: Any) -> Any:
# Implemented to satisfy the ABC check. This is not needed by the
@@ -167,8 +154,13 @@ def __len__(self) -> int:
# performance reasons).
raise NotImplementedError("don't do this")
- @functools.lru_cache(maxsize=1)
def __bool__(self) -> bool:
+ if self._bool is not None:
+ return self._bool
+
if self._prefers_installed and self._installed:
+ self._bool = True
return True
- return any(self)
+
+ self._bool = any(self)
+ return self._bool
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/provider.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/provider.py
index fb0dd85f1..994748dba 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/provider.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/provider.py
@@ -1,22 +1,21 @@
-import collections
+from __future__ import annotations
+
import math
-from functools import lru_cache
+from collections.abc import Iterable, Iterator, Mapping, Sequence
+from functools import cache
from typing import (
TYPE_CHECKING,
- Dict,
- Iterable,
- Iterator,
- Mapping,
- Sequence,
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
+from .requirements import ExplicitRequirement
if TYPE_CHECKING:
from pip._vendor.resolvelib.providers import Preference
@@ -55,7 +54,7 @@ def _get_with_identifier(
mapping: Mapping[str, V],
identifier: str,
default: D,
-) -> Union[D, V]:
+) -> D | V:
"""Get item from a package name lookup mapping with a resolver identifier.
This extra logic is needed when the target mapping is keyed by package
@@ -90,29 +89,80 @@ class PipProvider(_ProviderBase):
def __init__(
self,
factory: Factory,
- constraints: Dict[str, Constraint],
+ constraints: dict[str, Constraint],
ignore_dependencies: bool,
upgrade_strategy: str,
- user_requested: Dict[str, int],
+ user_requested: dict[str, int],
) -> None:
self._factory = factory
self._constraints = constraints
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:
+ @property
+ def constraints(self) -> dict[str, Constraint]:
+ """Public view of user-specified constraints.
+
+ Exposes the provider's constraints mapping without encouraging
+ external callers to reach into private attributes.
+ """
+ return self._constraints
+
+ def identify(self, requirement_or_candidate: 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, 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_identifiers = set()
+ for info in backtrack_causes:
+ backtrack_identifiers.add(info.requirement.name)
+ if info.parent is not None:
+ backtrack_identifiers.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.
+ # This skips calling get_preference() for all other identifiers.
+ if identifier == REQUIRES_PYTHON_IDENTIFIER:
+ return [identifier]
+
+ # Check if this identifier is a backtrack cause
+ if identifier in backtrack_identifiers:
+ current_backtrack_causes.append(identifier)
+ continue
+
+ if current_backtrack_causes:
+ return current_backtrack_causes
+
+ return identifiers
+
def get_preference(
self,
identifier: str,
resolutions: Mapping[str, Candidate],
candidates: Mapping[str, Iterator[Candidate]],
- information: Mapping[str, Iterable["PreferenceInformation"]],
- backtrack_causes: Sequence["PreferenceInformation"],
- ) -> "Preference":
+ information: Mapping[str, Iterable[PreferenceInformation]],
+ backtrack_causes: Sequence[PreferenceInformation],
+ ) -> Preference:
"""Produce a sort key for given requirement based on preference.
The lower the return value is, the more preferred this group of
@@ -120,18 +170,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 ``==``.
- * 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 ``<``.
- * If equal, order alphabetically for consistency (helps debuggability).
+ * 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 ``!=``.
+ * Alphabetical order for consistency (aids debuggability).
"""
try:
next(iter(information[identifier]))
@@ -142,55 +194,39 @@ def get_preference(
else:
has_information = True
- if has_information:
- lookups = (r.get_candidate_lookup() for r, _ in information[identifier])
- candidate, ireqs = zip(*lookups)
+ if not has_information:
+ direct = False
+ ireqs: tuple[InstallRequirement | None, ...] = ()
else:
- candidate, ireqs = None, ()
+ # 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 = [
- 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)
+ upper_bounded = any(
+ ((op in ("<", "<=", "~=")) or (op == "==" and "*" in ver))
+ for op, ver 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
- # 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,
- inferred_depth,
+ not upper_bounded,
requested_order,
not unfree,
identifier,
@@ -238,21 +274,12 @@ def _eligible_for_upgrade(identifier: str) -> bool:
is_satisfied_by=self.is_satisfied_by,
)
- @lru_cache(maxsize=None)
- def is_satisfied_by(self, requirement: Requirement, candidate: Candidate) -> bool:
+ @staticmethod
+ @cache
+ def is_satisfied_by(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]
-
- @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
+ # 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/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/reporter.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/reporter.py
index 0594569d8..6ba9bbd70 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/reporter.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/reporter.py
@@ -1,17 +1,21 @@
+from __future__ import annotations
+
from collections import defaultdict
+from collections.abc import Mapping
from logging import getLogger
-from typing import Any, DefaultDict
+from typing import Any
from pip._vendor.resolvelib.reporters import BaseReporter
-from .base import Candidate, Requirement
+from .base import Candidate, Constraint, Requirement
logger = getLogger(__name__)
-class PipReporter(BaseReporter):
- def __init__(self) -> None:
- self.reject_count_by_package: DefaultDict[str, int] = defaultdict(int)
+class PipReporter(BaseReporter[Requirement, Candidate, str]):
+ def __init__(self, constraints: Mapping[str, Constraint] | None = None) -> None:
+ self.reject_count_by_package: defaultdict[str, int] = defaultdict(int)
+ self._constraints = constraints or {}
self._messages_at_reject_count = {
1: (
@@ -33,29 +37,40 @@ def __init__(self) -> None:
}
def rejecting_candidate(self, criterion: Any, candidate: Candidate) -> None:
+ """Report a candidate being rejected.
+
+ Logs both the rejection count message (if applicable) and details about
+ the requirements and constraints that caused the rejection.
+ """
self.reject_count_by_package[candidate.name] += 1
count = self.reject_count_by_package[candidate.name]
- if count not in self._messages_at_reject_count:
- return
-
- message = self._messages_at_reject_count[count]
- logger.info("INFO: %s", message.format(package_name=candidate.name))
+ if count in self._messages_at_reject_count:
+ message = self._messages_at_reject_count[count]
+ logger.info("INFO: %s", message.format(package_name=candidate.name))
msg = "Will try a different candidate, due to conflict:"
for req_info in criterion.information:
req, parent = req_info.requirement, req_info.parent
- # Inspired by Factory.get_installation_error
msg += "\n "
if parent:
msg += f"{parent.name} {parent.version} depends on "
else:
msg += "The user requested "
msg += req.format_for_error()
+
+ # Add any relevant constraints
+ if self._constraints:
+ name = candidate.name
+ constraint = self._constraints.get(name)
+ if constraint and constraint.specifier:
+ constraint_text = f"{name}{constraint.specifier}"
+ msg += f"\n The user requested (constraint) {constraint_text}"
+
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 +86,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: Candidate | None
+ ) -> None:
logger.info("Reporter.adding_requirement(%r, %r)", requirement, parent)
def rejecting_candidate(self, criterion: Any, candidate: Candidate) -> None:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/requirements.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/requirements.py
index b04f41b21..9c5e23374 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/requirements.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/requirements.py
@@ -1,4 +1,6 @@
-from typing import Any, Optional
+from __future__ import annotations
+
+from typing import Any
from pip._vendor.packaging.specifiers import SpecifierSet
from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
@@ -51,8 +53,8 @@ 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._equal_cache: str | None = None
+ self._hash: int | None = None
self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
@property
@@ -128,8 +130,8 @@ 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._equal_cache: str | None = None
+ self._hash: int | None = None
self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
@property
@@ -159,9 +161,15 @@ 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._hash: int | None = None
self._candidate = match
+ # Pre-compute candidate lookup to avoid repeated specifier checks
+ if specifier.contains(match.version, prereleases=True):
+ self._candidate_lookup: CandidateLookup = (match, None)
+ else:
+ self._candidate_lookup = (None, None)
+
def __str__(self) -> str:
return f"Python {self.specifier}"
@@ -195,9 +203,7 @@ def format_for_error(self) -> str:
return str(self)
def get_candidate_lookup(self) -> CandidateLookup:
- if self.specifier.contains(self._candidate.version, prereleases=True):
- return self._candidate, None
- return None, None
+ return self._candidate_lookup
def is_satisfied_by(self, candidate: Candidate) -> bool:
assert candidate.name == self._candidate.name, "Not Python candidate"
diff --git a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/resolver.py b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/resolver.py
index c12beef0b..7e44c1732 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/resolver.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/resolution/resolvelib/resolver.py
@@ -1,15 +1,18 @@
+from __future__ import annotations
+
import contextlib
import functools
import logging
import os
-from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple, cast
+from typing import TYPE_CHECKING, 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
@@ -42,7 +45,7 @@ def __init__(
self,
preparer: RequirementPreparer,
finder: PackageFinder,
- wheel_cache: Optional[WheelCache],
+ wheel_cache: WheelCache | None,
make_install_req: InstallRequirementProvider,
use_user_site: bool,
ignore_dependencies: bool,
@@ -50,7 +53,7 @@ def __init__(
ignore_requires_python: bool,
force_reinstall: bool,
upgrade_strategy: str,
- py_version_info: Optional[Tuple[int, ...]] = None,
+ py_version_info: tuple[int, ...] | None = None,
):
super().__init__()
assert upgrade_strategy in self._allowed_strategies
@@ -68,10 +71,10 @@ def __init__(
)
self.ignore_dependencies = ignore_dependencies
self.upgrade_strategy = upgrade_strategy
- self._result: Optional[Result] = None
+ self._result: Result | None = None
def resolve(
- self, root_reqs: List[InstallRequirement], check_supported_wheels: bool
+ self, root_reqs: list[InstallRequirement], check_supported_wheels: bool
) -> RequirementSet:
collected = self.factory.collect_root_requirements(root_reqs)
provider = PipProvider(
@@ -82,9 +85,10 @@ 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()
+ reporter = PipReporter(constraints=provider.constraints)
+
resolver: RLResolver[Requirement, Candidate, str] = RLResolver(
provider,
reporter,
@@ -102,6 +106,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
@@ -175,16 +181,11 @@ def resolve(
req_set.add_named_requirement(ireq)
- 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(
self, req_set: RequirementSet
- ) -> List[InstallRequirement]:
+ ) -> list[InstallRequirement]:
"""Get order for installation of requirements in RequirementSet.
The returned list contains a requirement before another that depends on
@@ -215,8 +216,8 @@ def get_installation_order(
def get_topological_weights(
- graph: "DirectedGraph[Optional[str]]", requirement_keys: Set[str]
-) -> Dict[Optional[str], int]:
+ graph: DirectedGraph[str | None], requirement_keys: set[str]
+) -> dict[str | None, int]:
"""Assign weights to each node based on how "deep" they are.
This implementation may change at any point in the future without prior
@@ -242,14 +243,25 @@ def get_topological_weights(
We are only interested in the weights of packages that are in the
requirement_keys.
"""
- path: Set[Optional[str]] = set()
- weights: Dict[Optional[str], int] = {}
+ path: set[str | None] = set()
+ weights: dict[str | None, list[int]] = {}
- def visit(node: Optional[str]) -> None:
+ def visit(node: str | None) -> None:
if node in path:
# We hit a cycle, so we'll break it here.
return
+ # The walk is exponential and for pathologically connected graphs (which
+ # are the ones most likely to contain cycles in the first place) it can
+ # take until the heat-death of the universe. To counter this we limit
+ # the number of attempts to visit (i.e. traverse through) any given
+ # node. We choose a value here which gives decent enough coverage for
+ # fairly well behaved graphs, and still limits the walk complexity to be
+ # linear in nature.
+ cur_weights = weights.get(node, [])
+ if len(cur_weights) >= 5:
+ return
+
# Time to visit the children!
path.add(node)
for child in graph.iter_children(node):
@@ -259,14 +271,14 @@ def visit(node: Optional[str]) -> None:
if node not in requirement_keys:
return
- last_known_parent_count = weights.get(node, 0)
- weights[node] = max(last_known_parent_count, len(path))
+ cur_weights.append(len(path))
+ weights[node] = cur_weights
- # Simplify the graph, pruning leaves that have no dependencies.
- # This is needed for large graphs (say over 200 packages) because the
- # `visit` function is exponentially slower then, taking minutes.
+ # Simplify the graph, pruning leaves that have no dependencies. This is
+ # needed for large graphs (say over 200 packages) because the `visit`
+ # function is slower for large/densely connected graphs, taking minutes.
# See https://github.com/pypa/pip/issues/10557
- # We will loop until we explicitly break the loop.
+ # We repeat the pruning step until we have no more leaves to remove.
while True:
leaves = set()
for key in graph:
@@ -286,12 +298,13 @@ def visit(node: Optional[str]) -> None:
for leaf in leaves:
if leaf not in requirement_keys:
continue
- weights[leaf] = weight
+ weights[leaf] = [weight]
# Remove the leaves from the graph, making it simpler.
for leaf in leaves:
graph.remove(leaf)
- # Visit the remaining graph.
+ # Visit the remaining graph, this will only have nodes to handle if the
+ # graph had a cycle in it, which the pruning step above could not handle.
# `None` is guaranteed to be the root node by resolvelib.
visit(None)
@@ -300,13 +313,15 @@ def visit(node: Optional[str]) -> None:
difference = set(weights.keys()).difference(requirement_keys)
assert not difference, difference
- return weights
+ # Now give back all the weights, choosing the largest ones from what we
+ # accumulated.
+ return {node: max(wgts) for (node, wgts) in weights.items()}
def _req_set_item_sorter(
- item: Tuple[str, InstallRequirement],
- weights: Dict[Optional[str], int],
-) -> Tuple[int, str]:
+ item: tuple[str, InstallRequirement],
+ weights: dict[str | None, int],
+) -> tuple[int, str]:
"""Key function used to sort install requirements for installation.
Based on the "weight" mapping calculated in ``get_installation_order()``.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/self_outdated_check.py b/addons/source-python/packages/site-packages/pip/_internal/self_outdated_check.py
index 2e0e3df35..e131ec8f8 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/self_outdated_check.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/self_outdated_check.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import datetime
import functools
import hashlib
@@ -7,7 +9,7 @@
import os.path
import sys
from dataclasses import dataclass
-from typing import Any, Callable, Dict, Optional
+from typing import Callable
from pip._vendor.packaging.version import Version
from pip._vendor.packaging.version import parse as parse_version
@@ -18,14 +20,21 @@
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.release_control import ReleaseControl
from pip._internal.models.selection_prefs import SelectionPreferences
from pip._internal.network.session import PipSession
from pip._internal.utils.compat import WINDOWS
+from pip._internal.utils.datetime import parse_iso_datetime
from pip._internal.utils.entrypoints import (
get_best_invocation_for_this_pip,
get_best_invocation_for_this_python,
)
-from pip._internal.utils.filesystem import adjacent_tmp_file, check_path_owner, replace
+from pip._internal.utils.filesystem import (
+ adjacent_tmp_file,
+ check_path_owner,
+ copy_directory_permissions,
+ replace,
+)
from pip._internal.utils.misc import (
ExternallyManagedEnvironment,
check_externally_managed,
@@ -43,18 +52,9 @@ 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] = {}
+ self._state: dict[str, str] = {}
self._statefile_path = None
# Try to load the existing state
@@ -74,7 +74,7 @@ def __init__(self, cache_dir: str) -> None:
def key(self) -> str:
return sys.prefix
- def get(self, current_time: datetime.datetime) -> Optional[str]:
+ def get(self, current_time: datetime.datetime) -> str | None:
"""Check if we have a not-outdated version loaded already."""
if not self._state:
return None
@@ -86,7 +86,7 @@ def get(self, current_time: datetime.datetime) -> Optional[str]:
return None
# Determine if we need to refresh the state
- last_check = _convert_date(self._state["last_check"])
+ last_check = parse_iso_datetime(self._state["last_check"])
time_since_last_check = current_time - last_check
if time_since_last_check > _WEEK:
return None
@@ -98,13 +98,15 @@ def set(self, pypi_version: str, current_time: datetime.datetime) -> None:
if not self._statefile_path:
return
+ statefile_directory = os.path.dirname(self._statefile_path)
+
# Check to make sure that we own the directory
- if not check_path_owner(os.path.dirname(self._statefile_path)):
+ if not check_path_owner(statefile_directory):
return
# Now that we've ensured the directory is owned by this user, we'll go
# ahead and make sure that all our directories are created.
- ensure_dir(os.path.dirname(self._statefile_path))
+ ensure_dir(statefile_directory)
state = {
# Include the key so it's easy to tell which pip wrote the
@@ -118,6 +120,7 @@ def set(self, pypi_version: str, current_time: datetime.datetime) -> None:
with adjacent_tmp_file(self._statefile_path) as f:
f.write(text.encode())
+ copy_directory_permissions(statefile_directory, f)
try:
# Since we have a prefix-specific state file, we can just
@@ -165,7 +168,7 @@ def was_installed_by_pip(pkg: str) -> bool:
def _get_current_remote_pip_version(
session: PipSession, options: optparse.Values
-) -> Optional[str]:
+) -> str | None:
# Lets use PackageFinder to see what the latest pip version is
link_collector = LinkCollector.create(
session,
@@ -177,7 +180,7 @@ def _get_current_remote_pip_version(
# yanked version.
selection_prefs = SelectionPreferences(
allow_yanked=False,
- allow_all_prereleases=False, # Explicitly set to False
+ release_control=ReleaseControl(only_final={"pip"}),
)
finder = PackageFinder.create(
@@ -196,8 +199,8 @@ def _self_version_check_logic(
state: SelfCheckState,
current_time: datetime.datetime,
local_version: Version,
- get_remote_version: Callable[[], Optional[str]],
-) -> Optional[UpgradePrompt]:
+ get_remote_version: Callable[[], str | None],
+) -> UpgradePrompt | None:
remote_version_str = state.get(current_time)
if remote_version_str is None:
remote_version_str = get_remote_version()
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/appdirs.py b/addons/source-python/packages/site-packages/pip/_internal/utils/appdirs.py
index 16933bf8a..4152528f6 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/appdirs.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/appdirs.py
@@ -8,7 +8,6 @@
import os
import sys
-from typing import List
from pip._vendor import platformdirs as _appdirs
@@ -40,9 +39,10 @@ def user_config_dir(appname: str, roaming: bool = True) -> str:
# for the discussion regarding site_config_dir locations
# see
-def site_config_dirs(appname: str) -> List[str]:
+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/addons/source-python/packages/site-packages/pip/_internal/utils/compat.py b/addons/source-python/packages/site-packages/pip/_internal/utils/compat.py
index d8b54e4ee..324789f1d 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/compat.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/compat.py
@@ -7,7 +7,7 @@
import sys
from typing import IO
-__all__ = ["get_path_uid", "stdlib_pkgs", "WINDOWS"]
+__all__ = ["get_path_uid", "stdlib_pkgs", "tomllib", "WINDOWS"]
logger = logging.getLogger(__name__)
@@ -67,6 +67,12 @@ def open_text_resource(
)
+if sys.version_info >= (3, 11):
+ import tomllib
+else:
+ from pip._vendor import tomli as tomllib
+
+
# packages in the stdlib that may have installation metadata, but should not be
# considered 'installed'. this theoretically could be determined based on
# dist.location (py27:`sysconfig.get_paths()['stdlib']`,
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/compatibility_tags.py b/addons/source-python/packages/site-packages/pip/_internal/utils/compatibility_tags.py
index 2e7b7450d..6d98171da 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/compatibility_tags.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/compatibility_tags.py
@@ -1,12 +1,13 @@
-"""Generate and work with PEP 425 Compatibility Tags.
-"""
+"""Generate and work with PEP 425 Compatibility Tags."""
+
+from __future__ import annotations
import re
-from typing import List, Optional, Tuple
from pip._vendor.packaging.tags import (
PythonVersion,
Tag,
+ android_platforms,
compatible_tags,
cpython_tags,
generic_tags,
@@ -19,12 +20,12 @@
_apple_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")
-def version_info_to_nodot(version_info: Tuple[int, ...]) -> str:
+def version_info_to_nodot(version_info: tuple[int, ...]) -> str:
# Only use up to the first two numbers.
return "".join(map(str, version_info[:2]))
-def _mac_platforms(arch: str) -> List[str]:
+def _mac_platforms(arch: str) -> list[str]:
match = _apple_arch_pat.match(arch)
if match:
name, major, minor, actual_arch = match.groups()
@@ -44,7 +45,7 @@ def _mac_platforms(arch: str) -> List[str]:
return arches
-def _ios_platforms(arch: str) -> List[str]:
+def _ios_platforms(arch: str) -> list[str]:
match = _apple_arch_pat.match(arch)
if match:
name, major, minor, actual_multiarch = match.groups()
@@ -64,7 +65,17 @@ def _ios_platforms(arch: str) -> List[str]:
return arches
-def _custom_manylinux_platforms(arch: str) -> List[str]:
+def _android_platforms(arch: str) -> list[str]:
+ match = re.fullmatch(r"android_(\d+)_(.+)", arch)
+ if match:
+ api_level, abi = match.groups()
+ return list(android_platforms(int(api_level), abi))
+ else:
+ # arch pattern didn't match (?!)
+ return [arch]
+
+
+def _custom_manylinux_platforms(arch: str) -> list[str]:
arches = [arch]
arch_prefix, arch_sep, arch_suffix = arch.partition("_")
if arch_prefix == "manylinux2014":
@@ -85,12 +96,14 @@ def _custom_manylinux_platforms(arch: str) -> List[str]:
return arches
-def _get_custom_platforms(arch: str) -> List[str]:
+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 == "android":
+ arches = _android_platforms(arch)
elif arch_prefix in ["manylinux2014", "manylinux2010"]:
arches = _custom_manylinux_platforms(arch)
else:
@@ -98,7 +111,7 @@ def _get_custom_platforms(arch: str) -> List[str]:
return arches
-def _expand_allowed_platforms(platforms: Optional[List[str]]) -> Optional[List[str]]:
+def _expand_allowed_platforms(platforms: list[str] | None) -> list[str] | None:
if not platforms:
return None
@@ -123,7 +136,7 @@ def _get_python_version(version: str) -> PythonVersion:
def _get_custom_interpreter(
- implementation: Optional[str] = None, version: Optional[str] = None
+ implementation: str | None = None, version: str | None = None
) -> str:
if implementation is None:
implementation = interpreter_name()
@@ -133,11 +146,11 @@ def _get_custom_interpreter(
def get_supported(
- version: Optional[str] = None,
- platforms: Optional[List[str]] = None,
- impl: Optional[str] = None,
- abis: Optional[List[str]] = None,
-) -> List[Tag]:
+ version: str | None = None,
+ platforms: list[str] | None = None,
+ impl: str | None = None,
+ abis: list[str] | None = None,
+) -> list[Tag]:
"""Return a list of supported tags for each version specified in
`versions`.
@@ -150,9 +163,9 @@ def get_supported(
:param abis: specify a list of abis you want valid
tags for, or None. If None, use the local interpreter abi.
"""
- supported: List[Tag] = []
+ supported: list[Tag] = []
- python_version: Optional[PythonVersion] = None
+ python_version: PythonVersion | None = None
if version is not None:
python_version = _get_python_version(version)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/datetime.py b/addons/source-python/packages/site-packages/pip/_internal/utils/datetime.py
index 8668b3b0e..f8870eacd 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/datetime.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/datetime.py
@@ -1,7 +1,7 @@
-"""For when pip wants to check the date or time.
-"""
+"""For when pip wants to check the date or time."""
import datetime
+import sys
def today_is_later_than(year: int, month: int, day: int) -> bool:
@@ -9,3 +9,20 @@ def today_is_later_than(year: int, month: int, day: int) -> bool:
given = datetime.date(year, month, day)
return today > given
+
+
+def parse_iso_datetime(isodate: str) -> datetime.datetime:
+ """Convert an ISO format string to a datetime.
+
+ Handles the format 2020-01-22T14:24:01Z (trailing Z)
+ which is not supported by older versions of fromisoformat.
+ """
+ # Python 3.11+ supports Z suffix natively in fromisoformat
+ if sys.version_info >= (3, 11):
+ return datetime.datetime.fromisoformat(isodate)
+ else:
+ return datetime.datetime.fromisoformat(
+ isodate.replace("Z", "+00:00")
+ if isodate.endswith("Z") and ("T" in isodate or " " in isodate.strip())
+ else isodate
+ )
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/deprecation.py b/addons/source-python/packages/site-packages/pip/_internal/utils/deprecation.py
index 0911147e7..96e7783fe 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/deprecation.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/deprecation.py
@@ -2,9 +2,11 @@
A module that implements tooling to enable easy warnings about deprecations.
"""
+from __future__ import annotations
+
import logging
import warnings
-from typing import Any, Optional, TextIO, Type, Union
+from typing import Any, TextIO
from pip._vendor.packaging.version import parse
@@ -22,12 +24,12 @@ class PipDeprecationWarning(Warning):
# Warnings <-> Logging Integration
def _showwarning(
- message: Union[Warning, str],
- category: Type[Warning],
+ message: Warning | str,
+ category: type[Warning],
filename: str,
lineno: int,
- file: Optional[TextIO] = None,
- line: Optional[str] = None,
+ file: TextIO | None = None,
+ line: str | None = None,
) -> None:
if file is not None:
if _original_showwarning is not None:
@@ -55,10 +57,10 @@ def install_warning_logger() -> None:
def deprecated(
*,
reason: str,
- replacement: Optional[str],
- gone_in: Optional[str],
- feature_flag: Optional[str] = None,
- issue: Optional[int] = None,
+ replacement: str | None,
+ gone_in: str | None,
+ feature_flag: str | None = None,
+ issue: int | None = None,
) -> None:
"""Helper to deprecate existing functionality.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/direct_url_helpers.py b/addons/source-python/packages/site-packages/pip/_internal/utils/direct_url_helpers.py
index 66020d396..3cbc1e763 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/direct_url_helpers.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/direct_url_helpers.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from __future__ import annotations
from pip._internal.models.direct_url import ArchiveInfo, DirectUrl, DirInfo, VcsInfo
from pip._internal.models.link import Link
@@ -37,7 +37,7 @@ def direct_url_for_editable(source_dir: str) -> DirectUrl:
def direct_url_from_link(
- link: Link, source_dir: Optional[str] = None, link_is_in_wheel_cache: bool = False
+ link: Link, source_dir: str | None = None, link_is_in_wheel_cache: bool = False
) -> DirectUrl:
if link.is_vcs:
vcs_backend = vcs.get_backend_for_scheme(link.scheme)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/egg_link.py b/addons/source-python/packages/site-packages/pip/_internal/utils/egg_link.py
index 4a384a636..dc85a58b3 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/egg_link.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/egg_link.py
@@ -1,7 +1,8 @@
+from __future__ import annotations
+
import os
import re
import sys
-from typing import List, Optional
from pip._internal.locations import site_packages, user_site
from pip._internal.utils.virtualenv import (
@@ -15,7 +16,7 @@
]
-def _egg_link_names(raw_name: str) -> List[str]:
+def _egg_link_names(raw_name: str) -> list[str]:
"""
Convert a Name metadata value to a .egg-link name, by applying
the same substitution as pkg_resources's safe_name function.
@@ -30,7 +31,7 @@ def _egg_link_names(raw_name: str) -> List[str]:
]
-def egg_link_path_from_sys_path(raw_name: str) -> Optional[str]:
+def egg_link_path_from_sys_path(raw_name: str) -> str | None:
"""
Look for a .egg-link file for project name, by walking sys.path.
"""
@@ -43,7 +44,7 @@ def egg_link_path_from_sys_path(raw_name: str) -> Optional[str]:
return None
-def egg_link_path_from_location(raw_name: str) -> Optional[str]:
+def egg_link_path_from_location(raw_name: str) -> str | None:
"""
Return the path for the .egg-link file if it exists, otherwise, None.
@@ -61,7 +62,7 @@ def egg_link_path_from_location(raw_name: str) -> Optional[str]:
This method will just return the first one found.
"""
- sites: List[str] = []
+ sites: list[str] = []
if running_under_virtualenv():
sites.append(site_packages)
if not virtualenv_no_global() and user_site:
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/entrypoints.py b/addons/source-python/packages/site-packages/pip/_internal/utils/entrypoints.py
index 150136938..e3a150eeb 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/entrypoints.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/entrypoints.py
@@ -1,8 +1,9 @@
+from __future__ import annotations
+
import itertools
import os
import shutil
import sys
-from typing import List, Optional
from pip._internal.cli.main import main
from pip._internal.utils.compat import WINDOWS
@@ -20,7 +21,7 @@
]
-def _wrapper(args: Optional[List[str]] = None) -> int:
+def _wrapper(args: list[str] | None = None) -> int:
"""Central wrapper for all old entrypoints.
Historically pip has had several entrypoints defined. Because of issues
@@ -77,7 +78,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.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/filesystem.py b/addons/source-python/packages/site-packages/pip/_internal/utils/filesystem.py
index 22e356cdd..52eb78f42 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/filesystem.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/filesystem.py
@@ -1,11 +1,15 @@
+from __future__ import annotations
+
import fnmatch
import os
import os.path
import random
import sys
+from collections.abc import Generator
from contextlib import contextmanager
+from pathlib import Path
from tempfile import NamedTemporaryFile
-from typing import Any, BinaryIO, Generator, List, Union, cast
+from typing import Any, BinaryIO, Callable, cast
from pip._internal.utils.compat import get_path_uid
from pip._internal.utils.misc import format_size
@@ -115,17 +119,17 @@ def _test_writable_dir_win(path: str) -> bool:
raise OSError("Unexpected condition testing for writable directory")
-def find_files(path: str, pattern: str) -> List[str]:
+def find_files(path: str, pattern: str) -> list[str]:
"""Returns a list of absolute paths of files beneath path, recursively,
with filenames which match the UNIX-style shell glob pattern."""
- result: List[str] = []
+ result: list[str] = []
for root, _, files in os.walk(path):
matches = fnmatch.filter(files, pattern)
result.extend(os.path.join(root, f) for f in matches)
return result
-def file_size(path: str) -> Union[int, float]:
+def file_size(path: str) -> int | float:
# If it's a symlink, return 0.
if os.path.islink(path):
return 0
@@ -136,7 +140,7 @@ def format_file_size(path: str) -> str:
return format_size(file_size(path))
-def directory_size(path: str) -> Union[int, float]:
+def directory_size(path: str) -> int | float:
size = 0.0
for root, _dirs, files in os.walk(path):
for filename in files:
@@ -147,3 +151,53 @@ def directory_size(path: str) -> Union[int, float]:
def format_directory_size(path: str) -> str:
return format_size(directory_size(path))
+
+
+def copy_directory_permissions(directory: str, target_file: BinaryIO) -> None:
+ mode = (
+ os.stat(directory).st_mode & 0o666 # select read/write permissions of 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(target_file.fileno(), mode)
+ elif os.chmod in os.supports_follow_symlinks:
+ os.chmod(target_file.name, mode, follow_symlinks=False)
+
+
+def _subdirs_without_generic(
+ path: str, predicate: Callable[[str, list[str]], bool]
+) -> Generator[Path]:
+ """Yields every subdirectory of +path+ that has no files matching the
+ predicate under it."""
+
+ directories = []
+ excluded = set()
+
+ for root_str, _, filenames in os.walk(Path(path).resolve()):
+ root = Path(root_str)
+ if predicate(root_str, filenames):
+ # This directory should be excluded, so exclude it and all of its
+ # parent directories.
+ # The last item in root.parents is ".", so we ignore it.
+ #
+ # Wrapping this in `list()` is only needed for Python 3.9.
+ excluded.update(list(root.parents)[:-1])
+ excluded.add(root)
+ directories.append(root)
+
+ for d in sorted(directories, reverse=True):
+ if d not in excluded:
+ yield d
+
+
+def subdirs_without_files(path: str) -> Generator[Path]:
+ """Yields every subdirectory of +path+ that has no files under it."""
+ return _subdirs_without_generic(path, lambda root, filenames: len(filenames) > 0)
+
+
+def subdirs_without_wheels(path: str) -> Generator[Path]:
+ """Yields every subdirectory of +path+ that has no .whl files under it."""
+ return _subdirs_without_generic(
+ path, lambda root, filenames: any(x.endswith(".whl") for x in filenames)
+ )
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/filetypes.py b/addons/source-python/packages/site-packages/pip/_internal/utils/filetypes.py
index 594857017..2b8baad7c 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/filetypes.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/filetypes.py
@@ -1,21 +1,18 @@
-"""Filetype information.
-"""
-
-from typing import Tuple
+"""Filetype information."""
from pip._internal.utils.misc import splitext
WHEEL_EXTENSION = ".whl"
-BZ2_EXTENSIONS: Tuple[str, ...] = (".tar.bz2", ".tbz")
-XZ_EXTENSIONS: Tuple[str, ...] = (
+BZ2_EXTENSIONS: tuple[str, ...] = (".tar.bz2", ".tbz")
+XZ_EXTENSIONS: tuple[str, ...] = (
".tar.xz",
".txz",
".tlz",
".tar.lz",
".tar.lzma",
)
-ZIP_EXTENSIONS: Tuple[str, ...] = (".zip", WHEEL_EXTENSION)
-TAR_EXTENSIONS: Tuple[str, ...] = (".tar.gz", ".tgz", ".tar")
+ZIP_EXTENSIONS: tuple[str, ...] = (".zip", WHEEL_EXTENSION)
+TAR_EXTENSIONS: tuple[str, ...] = (".tar.gz", ".tgz", ".tar")
ARCHIVE_EXTENSIONS = ZIP_EXTENSIONS + BZ2_EXTENSIONS + TAR_EXTENSIONS + XZ_EXTENSIONS
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/glibc.py b/addons/source-python/packages/site-packages/pip/_internal/utils/glibc.py
index 998868ff2..2cb3013c7 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/glibc.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/glibc.py
@@ -1,14 +1,15 @@
+from __future__ import annotations
+
import os
import sys
-from typing import Optional, Tuple
-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 glibc_version_string_confstr() -> Optional[str]:
+def glibc_version_string_confstr() -> str | None:
"Primary implementation of glibc_version_string using os.confstr."
# os.confstr is quite a bit faster than ctypes.DLL. It's also less likely
# to be broken or missing. This strategy is used in the standard library
@@ -28,7 +29,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."
try:
@@ -88,7 +89,7 @@ def glibc_version_string_ctypes() -> Optional[str]:
# versions that was generated by pip 8.1.2 and earlier is useless and
# misleading. Solution: instead of using platform, use our code that actually
# works.
-def libc_ver() -> Tuple[str, str]:
+def libc_ver() -> tuple[str, str]:
"""Try to determine the glibc version
Returns a tuple of strings (lib, version) which default to empty strings
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/hashes.py b/addons/source-python/packages/site-packages/pip/_internal/utils/hashes.py
index 535e94fca..3d8c125ad 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/hashes.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/hashes.py
@@ -1,5 +1,8 @@
+from __future__ import annotations
+
import hashlib
-from typing import TYPE_CHECKING, BinaryIO, Dict, Iterable, List, NoReturn, Optional
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, BinaryIO, NoReturn
from pip._internal.exceptions import HashMismatch, HashMissing, InstallationError
from pip._internal.utils.misc import read_chunks
@@ -24,7 +27,7 @@ class Hashes:
"""
- def __init__(self, hashes: Optional[Dict[str, List[str]]] = None) -> None:
+ def __init__(self, hashes: dict[str, list[str]] | None = None) -> None:
"""
:param hashes: A dict of algorithm names pointing to lists of allowed
hex digests
@@ -36,7 +39,7 @@ def __init__(self, hashes: Optional[Dict[str, List[str]]] = None) -> None:
allowed[alg] = [k.lower() for k in sorted(keys)]
self._allowed = allowed
- def __and__(self, other: "Hashes") -> "Hashes":
+ def __and__(self, other: Hashes) -> Hashes:
if not isinstance(other, Hashes):
return NotImplemented
@@ -86,7 +89,7 @@ def check_against_chunks(self, chunks: Iterable[bytes]) -> None:
return
self._raise(gots)
- def _raise(self, gots: Dict[str, "_Hash"]) -> "NoReturn":
+ def _raise(self, gots: dict[str, _Hash]) -> NoReturn:
raise HashMismatch(self._allowed, gots)
def check_against_file(self, file: BinaryIO) -> None:
@@ -101,7 +104,7 @@ 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:
+ 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):
@@ -143,5 +146,5 @@ def __init__(self) -> None:
# empty list, it will never match, so an error will always raise.
super().__init__(hashes={FAVORITE_HASH: []})
- def _raise(self, gots: Dict[str, "_Hash"]) -> "NoReturn":
+ def _raise(self, gots: dict[str, _Hash]) -> NoReturn:
raise HashMissing(gots[FAVORITE_HASH].hexdigest())
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/logging.py b/addons/source-python/packages/site-packages/pip/_internal/utils/logging.py
index 62035fc40..e06770358 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/logging.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/logging.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import contextlib
import errno
import logging
@@ -5,10 +7,11 @@
import os
import sys
import threading
+from collections.abc import Generator
from dataclasses import dataclass
-from io import TextIOWrapper
+from io import StringIO, TextIOWrapper
from logging import Filter
-from typing import Any, ClassVar, Generator, List, Optional, TextIO, Type
+from typing import Any, ClassVar
from pip._vendor.rich.console import (
Console,
@@ -26,9 +29,11 @@
from pip._internal.utils._log import VERBOSE, getLogger
from pip._internal.utils.compat import WINDOWS
from pip._internal.utils.deprecation import DEPRECATION_MSG_PREFIX
-from pip._internal.utils.misc import ensure_dir
+from pip._internal.utils.misc import StreamWrapper, ensure_dir
_log_state = threading.local()
+_stdout_console = None
+_stderr_console = None
subprocess_logger = getLogger("pip.subprocessor")
@@ -38,7 +43,7 @@ class BrokenStdoutLoggingError(Exception):
"""
-def _is_broken_pipe_error(exc_class: Type[BaseException], exc: BaseException) -> bool:
+def _is_broken_pipe_error(exc_class: type[BaseException], exc: BaseException) -> bool:
if exc_class is BrokenPipeError:
return True
@@ -51,6 +56,38 @@ def _is_broken_pipe_error(exc_class: Type[BaseException], exc: BaseException) ->
return isinstance(exc, OSError) and exc.errno in (errno.EINVAL, errno.EPIPE)
+@contextlib.contextmanager
+def capture_logging() -> Generator[StringIO, None, None]:
+ """Capture all pip logs in a buffer temporarily."""
+ # Patching sys.std(out|err) directly is not viable as the caller
+ # may want to emit non-logging output (e.g. a rich spinner). To
+ # avoid capturing that, temporarily patch the root logging handlers
+ # to use new rich consoles that write to a StringIO.
+ handlers = {}
+ for handler in logging.getLogger().handlers:
+ if isinstance(handler, RichPipStreamHandler):
+ # Also store the handler's original console so it can be
+ # restored on context exit.
+ handlers[handler] = handler.console
+
+ fake_stream = StreamWrapper.from_stream(sys.stdout)
+ if not handlers:
+ yield fake_stream
+ return
+
+ # HACK: grab no_color attribute from a random handler console since
+ # it's a global option anyway.
+ no_color = next(iter(handlers.values())).no_color
+ fake_console = PipConsole(file=fake_stream, no_color=no_color, soft_wrap=True)
+ try:
+ for handler in handlers:
+ handler.console = fake_console
+ yield fake_stream
+ finally:
+ for handler, original_console in handlers.items():
+ handler.console = original_console
+
+
@contextlib.contextmanager
def indent_log(num: int = 2) -> Generator[None, None, None]:
"""
@@ -144,12 +181,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]]] = []
+ KEYWORDS: ClassVar[list[str] | None] = []
- 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,
@@ -158,7 +204,7 @@ def __init__(self, stream: Optional[TextIO], no_color: bool) -> None:
# Our custom override on Rich's logger, to make things work as we need them to.
def emit(self, record: logging.LogRecord) -> None:
- style: Optional[Style] = None
+ style: Style | None = None
# If we are given a diagnostic error to present, present it with indentation.
if getattr(record, "rich", False):
@@ -229,7 +275,7 @@ def filter(self, record: logging.LogRecord) -> bool:
return not super().filter(record)
-def setup_logging(verbosity: int, no_color: bool, user_log_file: Optional[str]) -> int:
+def setup_logging(verbosity: int, no_color: bool, user_log_file: str | None) -> int:
"""Configures and sets up all of the logging
Returns the requested logging level, as its integer value.
@@ -266,10 +312,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 +319,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 +356,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 +372,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/addons/source-python/packages/site-packages/pip/_internal/utils/misc.py b/addons/source-python/packages/site-packages/pip/_internal/utils/misc.py
index 44f6a05fb..66e521bbc 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/misc.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/misc.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import errno
import getpass
import hashlib
@@ -9,6 +11,7 @@
import sys
import sysconfig
import urllib.parse
+from collections.abc import Generator, Iterable, Iterator, Mapping, Sequence
from dataclasses import dataclass
from functools import partial
from io import StringIO
@@ -19,18 +22,9 @@
Any,
BinaryIO,
Callable,
- Generator,
- Iterable,
- Iterator,
- List,
- Mapping,
Optional,
- Sequence,
TextIO,
- Tuple,
- Type,
TypeVar,
- Union,
cast,
)
@@ -64,9 +58,9 @@
logger = logging.getLogger(__name__)
T = TypeVar("T")
-ExcInfo = Tuple[Type[BaseException], BaseException, TracebackType]
-VersionInfo = Tuple[int, int, int]
-NetlocTuple = Tuple[str, Tuple[Optional[str], Optional[str]]]
+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]
@@ -80,7 +74,7 @@ def get_pip_version() -> str:
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]:
+def normalize_version_info(py_version_info: tuple[int, ...]) -> tuple[int, int, int]:
"""
Convert a tuple of ints representing a Python version to one of length
three.
@@ -123,9 +117,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
-) -> None:
+def rmtree(dir: str, ignore_errors: bool = False, onexc: OnExc | None = None) -> None:
if ignore_errors:
onexc = _onerror_ignore
if onexc is None:
@@ -149,7 +141,7 @@ def _onerror_reraise(*_args: Any) -> None:
def rmtree_errorhandler(
func: FunctionType,
path: Path,
- exc_info: Union[ExcInfo, BaseException],
+ exc_info: ExcInfo | BaseException,
*,
onexc: OnExc = _onerror_reraise,
) -> None:
@@ -190,10 +182,12 @@ def rmtree_errorhandler(
def display_path(path: str) -> str:
"""Gives the display value for a given path, making it relative to cwd
if possible."""
- path = os.path.normcase(os.path.abspath(path))
- if path.startswith(os.getcwd() + os.path.sep):
- path = "." + path[len(os.getcwd()) :]
- return path
+ try:
+ relative = Path(path).relative_to(Path.cwd())
+ except ValueError:
+ # If the path isn't relative to the CWD, leave it alone
+ return path
+ return os.path.join(".", relative)
def backup_dir(dir: str, ext: str = ".bak") -> str:
@@ -276,7 +270,7 @@ def format_size(bytes: float) -> str:
return f"{int(bytes)} bytes"
-def tabulate(rows: Iterable[Iterable[Any]]) -> Tuple[List[str], List[int]]:
+def tabulate(rows: Iterable[Iterable[Any]]) -> tuple[list[str], list[int]]:
"""Return a list of formatted rows and a list of column sizes.
For example::
@@ -331,7 +325,7 @@ def normalize_path(path: str, resolve_symlinks: bool = True) -> str:
return os.path.normcase(path)
-def splitext(path: str) -> Tuple[str, str]:
+def splitext(path: str) -> tuple[str, str]:
"""Like os.path.splitext, but take off .tar too"""
base, ext = posixpath.splitext(path)
if base.lower().endswith(".tar"):
@@ -379,7 +373,7 @@ class StreamWrapper(StringIO):
orig_stream: TextIO
@classmethod
- def from_stream(cls, orig_stream: TextIO) -> "StreamWrapper":
+ def from_stream(cls, orig_stream: TextIO) -> StreamWrapper:
ret = cls()
ret.orig_stream = orig_stream
return ret
@@ -392,14 +386,14 @@ def encoding(self) -> str: # type: ignore
# Simulates an enum
-def enum(*sequential: Any, **named: Any) -> Type[Any]:
+def enum(*sequential: Any, **named: Any) -> type[Any]:
enums = dict(zip(sequential, range(len(sequential))), **named)
reverse = {value: key for key, value in enums.items()}
enums["reverse_mapping"] = reverse
return type("Enum", (), enums)
-def build_netloc(host: str, port: Optional[int]) -> str:
+def build_netloc(host: str, port: int | None) -> str:
"""
Build a netloc from a host-port pair
"""
@@ -421,7 +415,7 @@ def build_url_from_netloc(netloc: str, scheme: str = "https") -> str:
return f"{scheme}://{netloc}"
-def parse_netloc(netloc: str) -> Tuple[Optional[str], Optional[int]]:
+def parse_netloc(netloc: str) -> tuple[str | None, int | None]:
"""
Return the host-port pair from a netloc.
"""
@@ -443,7 +437,7 @@ def split_auth_from_netloc(netloc: str) -> NetlocTuple:
# behaves if more than one @ is present (which can be checked using
# the password attribute of urlsplit()'s return value).
auth, netloc = netloc.rsplit("@", 1)
- pw: Optional[str] = None
+ pw: str | None = None
if ":" in auth:
# Split from the left because that's how urllib.parse.urlsplit()
# behaves if more than one : is present (which again can be checked
@@ -480,8 +474,8 @@ def redact_netloc(netloc: str) -> str:
def _transform_url(
- url: str, transform_netloc: Callable[[str], Tuple[Any, ...]]
-) -> Tuple[str, NetlocTuple]:
+ url: str, transform_netloc: Callable[[str], tuple[Any, ...]]
+) -> tuple[str, NetlocTuple]:
"""Transform and replace netloc in a url.
transform_netloc is a function taking the netloc and returning a
@@ -503,13 +497,13 @@ def _get_netloc(netloc: str) -> NetlocTuple:
return split_auth_from_netloc(netloc)
-def _redact_netloc(netloc: str) -> Tuple[str]:
+def _redact_netloc(netloc: str) -> tuple[str]:
return (redact_netloc(netloc),)
def split_auth_netloc_from_url(
url: str,
-) -> Tuple[str, str, Tuple[Optional[str], Optional[str]]]:
+) -> tuple[str, str, tuple[str | None, str | None]]:
"""
Parse a url into separate netloc, auth, and url with no auth.
@@ -549,14 +543,18 @@ def __repr__(self) -> str:
def __str__(self) -> str:
return self.redacted
- # This is useful for testing.
- def __eq__(self, other: Any) -> bool:
- if type(self) is not type(other):
- return False
+ def __eq__(self, other: object) -> bool:
+ # Equality is particularly useful for testing.
+ if type(self) is type(other):
+ # The string being used for redaction doesn't also have to match,
+ # just the raw, original string.
+ return self.secret == cast(HiddenText, other).secret
+ return NotImplemented
- # The string being used for redaction doesn't also have to match,
- # just the raw, original string.
- return self.secret == other.secret
+ # Disable hashing, since we have a custom __eq__ and don't need hash-ability
+ # (yet). The only required property of hashing is that objects which compare
+ # equal have the same hash value.
+ __hash__ = None # type: ignore[assignment]
def hide_value(value: str) -> HiddenText:
@@ -614,7 +612,7 @@ def is_console_interactive() -> bool:
return sys.stdin is not None and sys.stdin.isatty()
-def hash_file(path: str, blocksize: int = 1 << 20) -> Tuple[Any, int]:
+def hash_file(path: str, blocksize: int = 1 << 20) -> tuple[Any, int]:
"""Return (hash, length) for path using hashlib.sha256()"""
h = hashlib.sha256()
@@ -626,7 +624,7 @@ def hash_file(path: str, blocksize: int = 1 << 20) -> Tuple[Any, int]:
return h, length
-def pairwise(iterable: Iterable[Any]) -> Iterator[Tuple[Any, Any]]:
+def pairwise(iterable: Iterable[Any]) -> Iterator[tuple[Any, Any]]:
"""
Return paired elements.
@@ -639,7 +637,7 @@ def pairwise(iterable: Iterable[Any]) -> Iterator[Tuple[Any, Any]]:
def partition(
pred: Callable[[T], bool], iterable: Iterable[T]
-) -> Tuple[Iterable[T], Iterable[T]]:
+) -> tuple[Iterable[T], Iterable[T]]:
"""
Use a predicate to partition entries into false entries and true entries,
like
@@ -656,9 +654,9 @@ def __init__(
config_holder: Any,
source_dir: str,
build_backend: str,
- backend_path: Optional[str] = None,
- runner: Optional[Callable[..., None]] = None,
- python_executable: Optional[str] = None,
+ backend_path: str | None = None,
+ runner: Callable[..., None] | None = None,
+ python_executable: str | None = None,
):
super().__init__(
source_dir, build_backend, backend_path, runner, python_executable
@@ -668,8 +666,8 @@ def __init__(
def build_wheel(
self,
wheel_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
- metadata_directory: Optional[str] = None,
+ config_settings: Mapping[str, Any] | None = None,
+ metadata_directory: str | None = None,
) -> str:
cs = self.config_holder.config_settings
return super().build_wheel(
@@ -679,7 +677,7 @@ def build_wheel(
def build_sdist(
self,
sdist_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
+ config_settings: Mapping[str, Any] | None = None,
) -> str:
cs = self.config_holder.config_settings
return super().build_sdist(sdist_directory, config_settings=cs)
@@ -687,8 +685,8 @@ def build_sdist(
def build_editable(
self,
wheel_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
- metadata_directory: Optional[str] = None,
+ config_settings: Mapping[str, Any] | None = None,
+ metadata_directory: str | None = None,
) -> str:
cs = self.config_holder.config_settings
return super().build_editable(
@@ -696,19 +694,19 @@ def build_editable(
)
def get_requires_for_build_wheel(
- self, config_settings: Optional[Mapping[str, Any]] = None
+ self, config_settings: Mapping[str, Any] | None = 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[Mapping[str, Any]] = None
+ self, config_settings: Mapping[str, Any] | None = 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[Mapping[str, Any]] = None
+ self, config_settings: Mapping[str, Any] | None = None
) -> Sequence[str]:
cs = self.config_holder.config_settings
return super().get_requires_for_build_editable(config_settings=cs)
@@ -716,7 +714,7 @@ def get_requires_for_build_editable(
def prepare_metadata_for_build_wheel(
self,
metadata_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
+ config_settings: Mapping[str, Any] | None = None,
_allow_fallback: bool = True,
) -> str:
cs = self.config_holder.config_settings
@@ -729,9 +727,9 @@ def prepare_metadata_for_build_wheel(
def prepare_metadata_for_build_editable(
self,
metadata_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
+ config_settings: Mapping[str, Any] | None = None,
_allow_fallback: bool = True,
- ) -> Optional[str]:
+ ) -> str | None:
cs = self.config_holder.config_settings
return super().prepare_metadata_for_build_editable(
metadata_directory=metadata_directory,
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/packaging.py b/addons/source-python/packages/site-packages/pip/_internal/utils/packaging.py
index caad70f7f..3cbc0490a 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/packaging.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/packaging.py
@@ -1,19 +1,17 @@
+from __future__ import annotations
+
import functools
import logging
-import re
-from typing import NewType, Optional, Tuple, cast
from pip._vendor.packaging import specifiers, version
from pip._vendor.packaging.requirements import Requirement
-NormalizedExtra = NewType("NormalizedExtra", str)
-
logger = logging.getLogger(__name__)
@functools.lru_cache(maxsize=32)
def check_requires_python(
- requires_python: Optional[str], version_info: Tuple[int, ...]
+ requires_python: str | None, version_info: tuple[int, ...]
) -> bool:
"""
Check if the given Python version matches a "Requires-Python" specifier.
@@ -35,7 +33,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
@@ -44,15 +42,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())
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/pylock.py b/addons/source-python/packages/site-packages/pip/_internal/utils/pylock.py
new file mode 100644
index 000000000..0f7783522
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/pylock.py
@@ -0,0 +1,116 @@
+from collections.abc import Iterable
+from pathlib import Path
+
+from pip._vendor.packaging.pylock import (
+ Package,
+ PackageArchive,
+ PackageDirectory,
+ PackageSdist,
+ PackageVcs,
+ PackageWheel,
+ Pylock,
+)
+from pip._vendor.packaging.version import Version
+
+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 _pylock_package_from_install_requirement(
+ ireq: InstallRequirement, base_dir: Path
+) -> Package:
+ base_dir = base_dir.resolve()
+ dist = ireq.get_dist()
+ download_info = ireq.download_info
+ assert download_info
+ package_version = None
+ package_vcs = None
+ package_directory = None
+ package_archive = None
+ package_sdist = None
+ package_wheels = None
+ if ireq.is_direct:
+ if isinstance(download_info.info, VcsInfo):
+ package_vcs = PackageVcs(
+ type=download_info.info.vcs,
+ url=download_info.url,
+ path=None,
+ 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=(
+ Path(url_to_path(download_info.url))
+ .resolve()
+ .relative_to(base_dir)
+ .as_posix()
+ ),
+ 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,
+ path=None,
+ hashes=download_info.info.hashes,
+ subdirectory=download_info.subdirectory,
+ )
+ else:
+ # should never happen
+ raise NotImplementedError()
+ else:
+ package_version = dist.version
+ 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(
+ name=dist.canonical_name,
+ version=package_version,
+ vcs=package_vcs,
+ directory=package_directory,
+ archive=package_archive,
+ sdist=package_sdist,
+ wheels=package_wheels,
+ )
+
+
+def pylock_from_install_requirements(
+ install_requirements: Iterable[InstallRequirement], base_dir: Path
+) -> Pylock:
+ return Pylock(
+ lock_version=Version("1.0"),
+ created_by="pip",
+ packages=sorted(
+ (
+ _pylock_package_from_install_requirement(ireq, base_dir)
+ for ireq in install_requirements
+ ),
+ key=lambda p: p.name,
+ ),
+ )
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/retry.py b/addons/source-python/packages/site-packages/pip/_internal/utils/retry.py
index abfe07286..27d3b6e78 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/retry.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/retry.py
@@ -1,11 +1,14 @@
+from __future__ import annotations
+
import functools
from time import perf_counter, sleep
-from typing import Callable, TypeVar
+from typing import TYPE_CHECKING, Callable, TypeVar
-from pip._vendor.typing_extensions import ParamSpec
+if TYPE_CHECKING:
+ from typing_extensions import ParamSpec
-T = TypeVar("T")
-P = ParamSpec("P")
+ T = TypeVar("T")
+ P = ParamSpec("P")
def retry(
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/subprocess.py b/addons/source-python/packages/site-packages/pip/_internal/utils/subprocess.py
index cb2e23f00..3e7b83f30 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/subprocess.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/subprocess.py
@@ -1,8 +1,11 @@
+from __future__ import annotations
+
import logging
import os
import shlex
import subprocess
-from typing import Any, Callable, Iterable, List, Literal, Mapping, Optional, Union
+from collections.abc import Iterable, Mapping
+from typing import Any, Callable, Literal, Union
from pip._vendor.rich.markup import escape
@@ -11,10 +14,10 @@
from pip._internal.utils.logging import VERBOSE, subprocess_logger
from pip._internal.utils.misc import HiddenText
-CommandArgs = List[Union[str, HiddenText]]
+CommandArgs = list[Union[str, HiddenText]]
-def make_command(*args: Union[str, HiddenText, CommandArgs]) -> CommandArgs:
+def make_command(*args: str | HiddenText | CommandArgs) -> CommandArgs:
"""
Create a CommandArgs object.
"""
@@ -31,7 +34,7 @@ def make_command(*args: Union[str, HiddenText, CommandArgs]) -> CommandArgs:
return command_args
-def format_command_args(args: Union[List[str], CommandArgs]) -> str:
+def format_command_args(args: list[str] | CommandArgs) -> str:
"""
Format command arguments for display.
"""
@@ -46,7 +49,7 @@ def format_command_args(args: Union[List[str], CommandArgs]) -> str:
)
-def reveal_command_args(args: Union[List[str], CommandArgs]) -> List[str]:
+def reveal_command_args(args: list[str] | CommandArgs) -> list[str]:
"""
Return the arguments in their raw, unredacted form.
"""
@@ -54,16 +57,16 @@ def reveal_command_args(args: Union[List[str], CommandArgs]) -> List[str]:
def call_subprocess(
- cmd: Union[List[str], CommandArgs],
+ cmd: list[str] | CommandArgs,
show_stdout: bool = False,
- cwd: Optional[str] = None,
- on_returncode: 'Literal["raise", "warn", "ignore"]' = "raise",
- extra_ok_returncodes: Optional[Iterable[int]] = None,
- extra_environ: Optional[Mapping[str, Any]] = None,
- unset_environ: Optional[Iterable[str]] = None,
- spinner: Optional[SpinnerInterface] = None,
- log_failed_cmd: Optional[bool] = True,
- stdout_only: Optional[bool] = False,
+ cwd: str | None = None,
+ on_returncode: Literal["raise", "warn", "ignore"] = "raise",
+ extra_ok_returncodes: Iterable[int] | None = None,
+ extra_environ: Mapping[str, Any] | None = None,
+ unset_environ: Iterable[str] | None = None,
+ spinner: SpinnerInterface | None = None,
+ log_failed_cmd: bool | None = True,
+ stdout_only: bool | None = False,
*,
command_desc: str,
) -> str:
@@ -229,9 +232,9 @@ def runner_with_spinner_message(message: str) -> Callable[..., None]:
"""
def runner(
- cmd: List[str],
- cwd: Optional[str] = None,
- extra_environ: Optional[Mapping[str, Any]] = None,
+ cmd: list[str],
+ cwd: str | None = None,
+ extra_environ: Mapping[str, Any] | None = None,
) -> None:
with open_spinner(message) as spinner:
call_subprocess(
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/temp_dir.py b/addons/source-python/packages/site-packages/pip/_internal/utils/temp_dir.py
index 06668e8ab..a9afa76c8 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/temp_dir.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/temp_dir.py
@@ -1,20 +1,18 @@
+from __future__ import annotations
+
import errno
import itertools
import logging
import os.path
import tempfile
import traceback
+from collections.abc import Generator
from contextlib import ExitStack, contextmanager
from pathlib import Path
from typing import (
Any,
Callable,
- Dict,
- Generator,
- List,
- Optional,
TypeVar,
- Union,
)
from pip._internal.utils.misc import enum, rmtree
@@ -33,7 +31,7 @@
)
-_tempdir_manager: Optional[ExitStack] = None
+_tempdir_manager: ExitStack | None = None
@contextmanager
@@ -51,7 +49,7 @@ class TempDirectoryTypeRegistry:
"""Manages temp directory behavior"""
def __init__(self) -> None:
- self._should_delete: Dict[str, bool] = {}
+ self._should_delete: dict[str, bool] = {}
def set_delete(self, kind: str, value: bool) -> None:
"""Indicate whether a TempDirectory of the given kind should be
@@ -66,7 +64,7 @@ def get_delete(self, kind: str) -> bool:
return self._should_delete.get(kind, True)
-_tempdir_registry: Optional[TempDirectoryTypeRegistry] = None
+_tempdir_registry: TempDirectoryTypeRegistry | None = None
@contextmanager
@@ -113,8 +111,8 @@ class TempDirectory:
def __init__(
self,
- path: Optional[str] = None,
- delete: Union[bool, None, _Default] = _default,
+ path: str | None = None,
+ delete: bool | None | _Default = _default,
kind: str = "temp",
globally_managed: bool = False,
ignore_cleanup_errors: bool = True,
@@ -184,7 +182,7 @@ def cleanup(self) -> None:
if not os.path.exists(self._path):
return
- errors: List[BaseException] = []
+ errors: list[BaseException] = []
def onerror(
func: Callable[..., Any],
@@ -245,7 +243,7 @@ class AdjacentTempDirectory(TempDirectory):
# with leading '-' and invalid metadata
LEADING_CHARS = "-~.=%0123456789"
- def __init__(self, original: str, delete: Optional[bool] = None) -> None:
+ def __init__(self, original: str, delete: bool | None = None) -> None:
self.original = original.rstrip("/\\")
super().__init__(delete=delete)
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/unpacking.py b/addons/source-python/packages/site-packages/pip/_internal/utils/unpacking.py
index 87a6d19ab..b3f52e85e 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/unpacking.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/unpacking.py
@@ -1,5 +1,6 @@
-"""Utilities related archives.
-"""
+"""Utilities related archives."""
+
+from __future__ import annotations
import logging
import os
@@ -8,7 +9,7 @@
import sys
import tarfile
import zipfile
-from typing import Iterable, List, Optional
+from collections.abc import Iterable
from zipfile import ZipInfo
from pip._internal.exceptions import InstallationError
@@ -48,7 +49,7 @@ def current_umask() -> int:
return mask
-def split_leading_dir(path: str) -> List[str]:
+def split_leading_dir(path: str) -> list[str]:
path = path.lstrip("/").lstrip("\\")
if "/" in path and (
("\\" in path and path.find("/") < path.find("\\")) or "\\" not in path
@@ -82,7 +83,7 @@ def is_within_directory(directory: str, target: str) -> bool:
abs_directory = os.path.abspath(directory)
abs_target = os.path.abspath(target)
- prefix = os.path.commonprefix([abs_directory, abs_target])
+ prefix = os.path.commonpath([abs_directory, abs_target])
return prefix == abs_directory
@@ -132,7 +133,7 @@ def unzip_file(filename: str, location: str, flatten: bool = True) -> None:
"outside target directory ({})"
)
raise InstallationError(message.format(filename, fn, location))
- if fn.endswith("/") or fn.endswith("\\"):
+ if fn.endswith(("/", "\\")):
# A directory
ensure_dir(fn)
else:
@@ -209,7 +210,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),
@@ -248,6 +248,20 @@ def pip_filter(member: tarfile.TarInfo, path: str) -> tarfile.TarInfo:
tar.close()
+def is_symlink_target_in_tar(tar: tarfile.TarFile, tarinfo: tarfile.TarInfo) -> bool:
+ """Check if the file pointed to by the symbolic link is in the tar archive"""
+ linkname = os.path.join(os.path.dirname(tarinfo.name), tarinfo.linkname)
+
+ linkname = os.path.normpath(linkname)
+ linkname = linkname.replace("\\", "/")
+
+ try:
+ tar.getmember(linkname)
+ return True
+ except KeyError:
+ return False
+
+
def _untar_without_filter(
filename: str,
location: str,
@@ -255,6 +269,9 @@ def _untar_without_filter(
leading: bool,
) -> None:
"""Fallback for Python without tarfile.data_filter"""
+ # NOTE: This function can be removed once pip requires CPython ≥ 3.12.
+ # PEP 706 added tarfile.data_filter, made tarfile extraction operations more secure.
+ # This feature is fully supported from CPython 3.12 onward.
for member in tar.getmembers():
fn = member.name
if leading:
@@ -269,6 +286,14 @@ def _untar_without_filter(
if member.isdir():
ensure_dir(path)
elif member.issym():
+ if not is_symlink_target_in_tar(tar, member):
+ message = (
+ "The tar file ({}) has a file ({}) trying to install "
+ "outside target directory ({})"
+ )
+ raise InstallationError(
+ message.format(filename, member.name, member.linkname)
+ )
try:
tar._extract_member(member, path)
except Exception as exc:
@@ -309,7 +334,7 @@ def _untar_without_filter(
def unpack_file(
filename: str,
location: str,
- content_type: Optional[str] = None,
+ content_type: str | None = None,
) -> None:
filename = os.path.realpath(filename)
if (
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/urls.py b/addons/source-python/packages/site-packages/pip/_internal/utils/urls.py
index 9f34f882a..e951a5e4e 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/urls.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/urls.py
@@ -12,7 +12,7 @@ def path_to_url(path: str) -> str:
quoted path parts.
"""
path = os.path.normpath(os.path.abspath(path))
- url = urllib.parse.urljoin("file:", urllib.request.pathname2url(path))
+ url = urllib.parse.urljoin("file://", urllib.request.pathname2url(path))
return url
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/virtualenv.py b/addons/source-python/packages/site-packages/pip/_internal/utils/virtualenv.py
index 882e36f5c..b1742a3e9 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/virtualenv.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/virtualenv.py
@@ -1,9 +1,10 @@
+from __future__ import annotations
+
import logging
import os
import re
import site
import sys
-from typing import List, Optional
logger = logging.getLogger(__name__)
_INCLUDE_SYSTEM_SITE_PACKAGES_REGEX = re.compile(
@@ -33,7 +34,7 @@ def running_under_virtualenv() -> bool:
return _running_under_venv() or _running_under_legacy_virtualenv()
-def _get_pyvenv_cfg_lines() -> Optional[List[str]]:
+def _get_pyvenv_cfg_lines() -> list[str] | None:
"""Reads {sys.prefix}/pyvenv.cfg and returns its contents as list of lines
Returns None, if it could not read/access the file.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/utils/wheel.py b/addons/source-python/packages/site-packages/pip/_internal/utils/wheel.py
index f85aee8a3..789e73629 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/utils/wheel.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/utils/wheel.py
@@ -1,10 +1,8 @@
-"""Support functions for working with wheel files.
-"""
+"""Support functions for working with wheel files."""
import logging
from email.message import Message
from email.parser import Parser
-from typing import Tuple
from zipfile import BadZipFile, ZipFile
from pip._vendor.packaging.utils import canonicalize_name
@@ -17,7 +15,7 @@
logger = logging.getLogger(__name__)
-def parse_wheel(wheel_zip: ZipFile, name: str) -> Tuple[str, Message]:
+def parse_wheel(wheel_zip: ZipFile, name: str) -> tuple[str, Message]:
"""Extract information from the provided wheel, ensuring it meets basic
standards.
@@ -94,7 +92,7 @@ def wheel_metadata(source: ZipFile, dist_info_dir: str) -> Message:
return Parser().parsestr(wheel_text)
-def wheel_version(wheel_data: Message) -> Tuple[int, ...]:
+def wheel_version(wheel_data: Message) -> tuple[int, ...]:
"""Given WHEEL metadata, return the parsed Wheel-Version.
Otherwise, raise UnsupportedWheel.
"""
@@ -110,7 +108,7 @@ def wheel_version(wheel_data: Message) -> Tuple[int, ...]:
raise UnsupportedWheel(f"invalid Wheel-Version: {version!r}")
-def check_compatibility(version: Tuple[int, ...], name: str) -> None:
+def check_compatibility(version: tuple[int, ...], name: str) -> None:
"""Raises errors or warns if called with an incompatible Wheel-Version.
pip should refuse to install a Wheel-Version that's a major series
diff --git a/addons/source-python/packages/site-packages/pip/_internal/vcs/bazaar.py b/addons/source-python/packages/site-packages/pip/_internal/vcs/bazaar.py
index c754b7cc5..3a8a21e62 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/vcs/bazaar.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/vcs/bazaar.py
@@ -1,5 +1,6 @@
+from __future__ import annotations
+
import logging
-from typing import List, Optional, Tuple
from pip._internal.utils.misc import HiddenText, display_path
from pip._internal.utils.subprocess import make_command
@@ -30,7 +31,7 @@ class Bazaar(VersionControl):
)
@staticmethod
- def get_base_rev_args(rev: str) -> List[str]:
+ def get_base_rev_args(rev: str) -> list[str]:
return ["-r", rev]
def fetch_new(
@@ -54,24 +55,41 @@ def fetch_new(
)
self.run_command(cmd_args)
- def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ def switch(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
self.run_command(make_command("switch", url), cwd=dest)
- def update(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ def update(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
+ flags = []
+
+ if verbosity <= 0:
+ flags.append("-q")
+
output = self.run_command(
make_command("info"), show_stdout=False, stdout_only=True, cwd=dest
)
if output.startswith("Standalone "):
# Older versions of pip used to create standalone branches.
# Convert the standalone branch to a checkout by calling "bzr bind".
- cmd_args = make_command("bind", "-q", url)
+ cmd_args = make_command("bind", *flags, url)
self.run_command(cmd_args, cwd=dest)
- cmd_args = make_command("update", "-q", rev_options.to_args())
+ cmd_args = make_command("update", *flags, rev_options.to_args())
self.run_command(cmd_args, cwd=dest)
@classmethod
- def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
+ def get_url_rev_and_auth(cls, url: str) -> tuple[str, str | None, AuthInfo]:
# hotfix the URL scheme after removing bzr+ from bzr+ssh:// re-add it
url, rev, user_pass = super().get_url_rev_and_auth(url)
if url.startswith("ssh://"):
@@ -104,7 +122,7 @@ def get_revision(cls, location: str) -> str:
return revision.splitlines()[-1]
@classmethod
- def is_commit_id_equal(cls, dest: str, name: Optional[str]) -> bool:
+ def is_commit_id_equal(cls, dest: str, name: str | None) -> bool:
"""Always assume the versions don't match"""
return False
diff --git a/addons/source-python/packages/site-packages/pip/_internal/vcs/git.py b/addons/source-python/packages/site-packages/pip/_internal/vcs/git.py
index 0425debb3..1769da791 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/vcs/git.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/vcs/git.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
import logging
import os.path
import pathlib
@@ -5,7 +7,7 @@
import urllib.parse
import urllib.request
from dataclasses import replace
-from typing import List, Optional, Tuple
+from typing import Any
from pip._internal.exceptions import BadCommand, InstallationError
from pip._internal.utils.misc import HiddenText, display_path, hide_url
@@ -74,9 +76,18 @@ class Git(VersionControl):
default_arg_rev = "HEAD"
@staticmethod
- def get_base_rev_args(rev: str) -> List[str]:
+ 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:
@@ -91,7 +102,7 @@ def is_immutable_rev_checkout(self, url: str, dest: str) -> bool:
is_tag_or_branch = bool(self.get_revision_sha(dest, rev_options.rev)[0])
return not is_tag_or_branch
- def get_git_version(self) -> Tuple[int, ...]:
+ def get_git_version(self) -> tuple[int, ...]:
version = self.run_command(
["version"],
command_desc="git version",
@@ -105,7 +116,7 @@ def get_git_version(self) -> Tuple[int, ...]:
return (int(match.group(1)), int(match.group(2)))
@classmethod
- def get_current_branch(cls, location: str) -> Optional[str]:
+ def get_current_branch(cls, location: str) -> str | None:
"""
Return the current branch, or None if HEAD isn't at a branch
(e.g. detached HEAD).
@@ -130,7 +141,7 @@ def get_current_branch(cls, location: str) -> Optional[str]:
return None
@classmethod
- def get_revision_sha(cls, dest: str, rev: str) -> Tuple[Optional[str], bool]:
+ def get_revision_sha(cls, dest: str, rev: str) -> tuple[str | None, bool]:
"""
Return (sha_or_none, is_branch), where sha_or_none is a commit hash
if the revision names a remote branch or tag, otherwise None.
@@ -225,7 +236,7 @@ def resolve_revision(
# Do not show a warning for the common case of something that has
# the form of a Git commit hash.
if not looks_like_hash(rev):
- logger.warning(
+ logger.info(
"Did not find branch or tag '%s', assuming revision or ref.",
rev,
)
@@ -245,7 +256,7 @@ def resolve_revision(
return rev_options
@classmethod
- def is_commit_id_equal(cls, dest: str, name: Optional[str]) -> bool:
+ def is_commit_id_equal(cls, dest: str, name: str | None) -> bool:
"""
Return whether the current commit hash equals the given name.
@@ -265,7 +276,7 @@ def fetch_new(
rev_display = rev_options.to_display()
logger.info("Cloning %s%s to %s", url, rev_display, display_path(dest))
if verbosity <= 0:
- flags: Tuple[str, ...] = ("--quiet",)
+ flags: tuple[str, ...] = ("--quiet",)
elif verbosity == 1:
flags = ()
else:
@@ -320,31 +331,59 @@ def fetch_new(
logger.info("Resolved %s to commit %s", url, rev_options.rev)
#: repo may contain submodules
- self.update_submodules(dest)
-
- def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ self.update_submodules(dest, verbosity=verbosity)
+
+ def switch(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
self.run_command(
make_command("config", "remote.origin.url", url),
cwd=dest,
)
- cmd_args = make_command("checkout", "-q", rev_options.to_args())
+
+ extra_flags = []
+
+ if verbosity <= 0:
+ extra_flags.append("-q")
+
+ cmd_args = make_command("checkout", *extra_flags, rev_options.to_args())
self.run_command(cmd_args, cwd=dest)
- self.update_submodules(dest)
+ self.update_submodules(dest, verbosity=verbosity)
+
+ def update(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
+ extra_flags = []
+
+ if verbosity <= 0:
+ extra_flags.append("-q")
- def update(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
# First fetch changes from the default remote
if self.get_git_version() >= (1, 9):
# fetch tags in addition to everything else
- self.run_command(["fetch", "-q", "--tags"], cwd=dest)
+ self.run_command(["fetch", "--tags", *extra_flags], cwd=dest)
else:
- self.run_command(["fetch", "-q"], cwd=dest)
+ self.run_command(["fetch", *extra_flags], cwd=dest)
# Then reset to wanted revision (maybe even origin/master)
rev_options = self.resolve_revision(dest, url, rev_options)
- cmd_args = make_command("reset", "--hard", "-q", rev_options.to_args())
+ cmd_args = make_command(
+ "reset",
+ "--hard",
+ *extra_flags,
+ rev_options.to_args(),
+ )
self.run_command(cmd_args, cwd=dest)
#: update submodules
- self.update_submodules(dest)
+ self.update_submodules(dest, verbosity=verbosity)
@classmethod
def get_remote_url(cls, location: str) -> str:
@@ -424,7 +463,7 @@ def has_commit(cls, location: str, rev: str) -> bool:
return True
@classmethod
- def get_revision(cls, location: str, rev: Optional[str] = None) -> str:
+ def get_revision(cls, location: str, rev: str | None = None) -> str:
if rev is None:
rev = "HEAD"
current_rev = cls.run_command(
@@ -436,7 +475,7 @@ def get_revision(cls, location: str, rev: Optional[str] = None) -> str:
return current_rev.strip()
@classmethod
- def get_subdirectory(cls, location: str) -> Optional[str]:
+ def get_subdirectory(cls, location: str) -> str | None:
"""
Return the path to Python project root, relative to the repo root.
Return None if the project root is in the repo root.
@@ -454,7 +493,7 @@ def get_subdirectory(cls, location: str) -> Optional[str]:
return find_path_to_project_root_from_repo_root(location, repo_root)
@classmethod
- def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
+ def get_url_rev_and_auth(cls, url: str) -> tuple[str, str | None, AuthInfo]:
"""
Prefixes stub URLs like 'user@hostname:user/repo.git' with 'ssh://'.
That's required because although they use SSH they sometimes don't
@@ -485,16 +524,21 @@ def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
return url, rev, user_pass
@classmethod
- def update_submodules(cls, location: str) -> None:
+ def update_submodules(cls, location: str, verbosity: int = 0) -> None:
+ argv = ["submodule", "update", "--init", "--recursive"]
+
+ if verbosity <= 0:
+ argv.append("-q")
+
if not os.path.exists(os.path.join(location, ".gitmodules")):
return
cls.run_command(
- ["submodule", "update", "--init", "--recursive", "-q"],
+ argv,
cwd=location,
)
@classmethod
- def get_repository_root(cls, location: str) -> Optional[str]:
+ def get_repository_root(cls, location: str) -> str | None:
loc = super().get_repository_root(location)
if loc:
return loc
diff --git a/addons/source-python/packages/site-packages/pip/_internal/vcs/mercurial.py b/addons/source-python/packages/site-packages/pip/_internal/vcs/mercurial.py
index c183d41d0..c87580316 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/vcs/mercurial.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/vcs/mercurial.py
@@ -1,7 +1,8 @@
+from __future__ import annotations
+
import configparser
import logging
import os
-from typing import List, Optional, Tuple
from pip._internal.exceptions import BadCommand, InstallationError
from pip._internal.utils.misc import HiddenText, display_path
@@ -30,7 +31,7 @@ class Mercurial(VersionControl):
)
@staticmethod
- def get_base_rev_args(rev: str) -> List[str]:
+ def get_base_rev_args(rev: str) -> list[str]:
return [f"--rev={rev}"]
def fetch_new(
@@ -44,7 +45,7 @@ def fetch_new(
display_path(dest),
)
if verbosity <= 0:
- flags: Tuple[str, ...] = ("--quiet",)
+ flags: tuple[str, ...] = ("--quiet",)
elif verbosity == 1:
flags = ()
elif verbosity == 2:
@@ -57,9 +58,20 @@ def fetch_new(
cwd=dest,
)
- def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ def switch(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
+ extra_flags = []
repo_config = os.path.join(dest, self.dirname, "hgrc")
config = configparser.RawConfigParser()
+
+ if verbosity <= 0:
+ extra_flags.append("-q")
+
try:
config.read(repo_config)
config.set("paths", "default", url.secret)
@@ -68,12 +80,23 @@ def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
except (OSError, configparser.NoSectionError) as exc:
logger.warning("Could not switch Mercurial repository to %s: %s", url, exc)
else:
- cmd_args = make_command("update", "-q", rev_options.to_args())
+ cmd_args = make_command("update", *extra_flags, rev_options.to_args())
self.run_command(cmd_args, cwd=dest)
- def update(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
- self.run_command(["pull", "-q"], cwd=dest)
- cmd_args = make_command("update", "-q", rev_options.to_args())
+ def update(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
+ extra_flags = []
+
+ if verbosity <= 0:
+ extra_flags.append("-q")
+
+ self.run_command(["pull", *extra_flags], cwd=dest)
+ cmd_args = make_command("update", *extra_flags, rev_options.to_args())
self.run_command(cmd_args, cwd=dest)
@classmethod
@@ -116,12 +139,12 @@ def get_requirement_revision(cls, location: str) -> str:
return current_rev_hash
@classmethod
- def is_commit_id_equal(cls, dest: str, name: Optional[str]) -> bool:
+ def is_commit_id_equal(cls, dest: str, name: str | None) -> bool:
"""Always assume the versions don't match"""
return False
@classmethod
- def get_subdirectory(cls, location: str) -> Optional[str]:
+ def get_subdirectory(cls, location: str) -> str | None:
"""
Return the path to Python project root, relative to the repo root.
Return None if the project root is in the repo root.
@@ -135,7 +158,7 @@ def get_subdirectory(cls, location: str) -> Optional[str]:
return find_path_to_project_root_from_repo_root(location, repo_root)
@classmethod
- def get_repository_root(cls, location: str) -> Optional[str]:
+ def get_repository_root(cls, location: str) -> str | None:
loc = super().get_repository_root(location)
if loc:
return loc
diff --git a/addons/source-python/packages/site-packages/pip/_internal/vcs/subversion.py b/addons/source-python/packages/site-packages/pip/_internal/vcs/subversion.py
index f359266d9..579f428c8 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/vcs/subversion.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/vcs/subversion.py
@@ -1,7 +1,8 @@
+from __future__ import annotations
+
import logging
import os
import re
-from typing import List, Optional, Tuple
from pip._internal.utils.misc import (
HiddenText,
@@ -38,7 +39,7 @@ def should_add_vcs_url_prefix(cls, remote_url: str) -> bool:
return True
@staticmethod
- def get_base_rev_args(rev: str) -> List[str]:
+ def get_base_rev_args(rev: str) -> list[str]:
return ["-r", rev]
@classmethod
@@ -73,7 +74,7 @@ def get_revision(cls, location: str) -> str:
@classmethod
def get_netloc_and_auth(
cls, netloc: str, scheme: str
- ) -> Tuple[str, Tuple[Optional[str], Optional[str]]]:
+ ) -> tuple[str, tuple[str | None, str | None]]:
"""
This override allows the auth information to be passed to svn via the
--username and --password options instead of via the URL.
@@ -86,7 +87,7 @@ def get_netloc_and_auth(
return split_auth_from_netloc(netloc)
@classmethod
- def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
+ def get_url_rev_and_auth(cls, url: str) -> tuple[str, str | None, AuthInfo]:
# hotfix the URL scheme after removing svn+ from svn+ssh:// re-add it
url, rev, user_pass = super().get_url_rev_and_auth(url)
if url.startswith("ssh://"):
@@ -94,9 +95,7 @@ def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
return url, rev, user_pass
@staticmethod
- def make_rev_args(
- username: Optional[str], password: Optional[HiddenText]
- ) -> CommandArgs:
+ def make_rev_args(username: str | None, password: HiddenText | None) -> CommandArgs:
extra_args: CommandArgs = []
if username:
extra_args += ["--username", username]
@@ -130,7 +129,7 @@ def get_remote_url(cls, location: str) -> str:
return url
@classmethod
- def _get_svn_url_rev(cls, location: str) -> Tuple[Optional[str], int]:
+ def _get_svn_url_rev(cls, location: str) -> tuple[str | None, int]:
from pip._internal.exceptions import InstallationError
entries_path = os.path.join(location, cls.dirname, "entries")
@@ -141,7 +140,7 @@ def _get_svn_url_rev(cls, location: str) -> Tuple[Optional[str], int]:
data = ""
url = None
- if data.startswith("8") or data.startswith("9") or data.startswith("10"):
+ if data.startswith(("8", "9", "10")):
entries = list(map(str.splitlines, data.split("\n\x0c\n")))
del entries[0][0] # get rid of the '8'
url = entries[0][3]
@@ -180,11 +179,11 @@ def _get_svn_url_rev(cls, location: str) -> Tuple[Optional[str], int]:
return url, rev
@classmethod
- def is_commit_id_equal(cls, dest: str, name: Optional[str]) -> bool:
+ def is_commit_id_equal(cls, dest: str, name: str | None) -> bool:
"""Always assume the versions don't match"""
return False
- def __init__(self, use_interactive: Optional[bool] = None) -> None:
+ def __init__(self, use_interactive: bool | None = None) -> None:
if use_interactive is None:
use_interactive = is_console_interactive()
self.use_interactive = use_interactive
@@ -194,11 +193,11 @@ def __init__(self, use_interactive: Optional[bool] = None) -> None:
# Special value definitions:
# None: Not evaluated yet.
# Empty tuple: Could not parse version.
- self._vcs_version: Optional[Tuple[int, ...]] = None
+ self._vcs_version: tuple[int, ...] | None = None
super().__init__()
- def call_vcs_version(self) -> Tuple[int, ...]:
+ def call_vcs_version(self) -> tuple[int, ...]:
"""Query the version of the currently installed Subversion client.
:return: A tuple containing the parts of the version information or
@@ -226,7 +225,7 @@ def call_vcs_version(self) -> Tuple[int, ...]:
return parsed_version
- def get_vcs_version(self) -> Tuple[int, ...]:
+ def get_vcs_version(self) -> tuple[int, ...]:
"""Return the version of the currently installed Subversion client.
If the version of the Subversion client has already been queried,
@@ -301,7 +300,13 @@ def fetch_new(
)
self.run_command(cmd_args)
- def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ def switch(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
cmd_args = make_command(
"switch",
self.get_remote_call_options(),
@@ -311,7 +316,13 @@ def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
)
self.run_command(cmd_args)
- def update(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ def update(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
cmd_args = make_command(
"update",
self.get_remote_call_options(),
diff --git a/addons/source-python/packages/site-packages/pip/_internal/vcs/versioncontrol.py b/addons/source-python/packages/site-packages/pip/_internal/vcs/versioncontrol.py
index a4133165e..95cefb49e 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/vcs/versioncontrol.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/vcs/versioncontrol.py
@@ -1,23 +1,18 @@
"""Handles all VCS (version control) support"""
+from __future__ import annotations
+
import logging
import os
import shutil
import sys
import urllib.parse
+from collections.abc import Iterable, Iterator, Mapping
from dataclasses import dataclass, field
from typing import (
Any,
- Dict,
- Iterable,
- Iterator,
- List,
Literal,
- Mapping,
Optional,
- Tuple,
- Type,
- Union,
)
from pip._internal.cli.spinners import SpinnerInterface
@@ -44,7 +39,7 @@
logger = logging.getLogger(__name__)
-AuthInfo = Tuple[Optional[str], Optional[str]]
+AuthInfo = tuple[Optional[str], Optional[str]]
def is_url(name: str) -> bool:
@@ -58,7 +53,7 @@ def is_url(name: str) -> bool:
def make_vcs_requirement_url(
- repo_url: str, rev: str, project_name: str, subdir: Optional[str] = None
+ repo_url: str, rev: str, project_name: str, subdir: str | None = None
) -> str:
"""
Return the URL for a VCS requirement.
@@ -67,8 +62,9 @@ def make_vcs_requirement_url(
repo_url: the remote VCS url, with any needed VCS prefix (e.g. "git+").
project_name: the (unescaped) project name.
"""
+ quoted_rev = urllib.parse.quote(rev, "/")
egg_project_name = project_name.replace("-", "_")
- req = f"{repo_url}@{rev}#egg={egg_project_name}"
+ req = f"{repo_url}@{quoted_rev}#egg={egg_project_name}"
if subdir:
req += f"&subdirectory={subdir}"
@@ -77,7 +73,7 @@ def make_vcs_requirement_url(
def find_path_to_project_root_from_repo_root(
location: str, repo_root: str
-) -> Optional[str]:
+) -> str | None:
"""
Find the the Python project's root by searching up the filesystem from
`location`. Return the path to project root relative to `repo_root`.
@@ -126,16 +122,16 @@ class RevOptions:
extra_args: a list of extra options.
"""
- vc_class: Type["VersionControl"]
- rev: Optional[str] = None
+ vc_class: type[VersionControl]
+ rev: str | None = None
extra_args: CommandArgs = field(default_factory=list)
- branch_name: Optional[str] = None
+ branch_name: str | None = None
def __repr__(self) -> str:
return f""
@property
- def arg_rev(self) -> Optional[str]:
+ def arg_rev(self) -> str | None:
if self.rev is None:
return self.vc_class.default_arg_rev
@@ -159,7 +155,7 @@ def to_display(self) -> str:
return f" (to revision {self.rev})"
- def make_new(self, rev: str) -> "RevOptions":
+ def make_new(self, rev: str) -> RevOptions:
"""
Make a copy of the current instance, but with a new rev.
@@ -170,7 +166,7 @@ def make_new(self, rev: str) -> "RevOptions":
class VcsSupport:
- _registry: Dict[str, "VersionControl"] = {}
+ _registry: dict[str, VersionControl] = {}
schemes = ["ssh", "git", "hg", "bzr", "sftp", "svn"]
def __init__(self) -> None:
@@ -183,21 +179,21 @@ def __iter__(self) -> Iterator[str]:
return self._registry.__iter__()
@property
- def backends(self) -> List["VersionControl"]:
+ def backends(self) -> list[VersionControl]:
return list(self._registry.values())
@property
- def dirnames(self) -> List[str]:
+ def dirnames(self) -> list[str]:
return [backend.dirname for backend in self.backends]
@property
- def all_schemes(self) -> List[str]:
- schemes: List[str] = []
+ def all_schemes(self) -> list[str]:
+ schemes: list[str] = []
for backend in self.backends:
schemes.extend(backend.schemes)
return schemes
- def register(self, cls: Type["VersionControl"]) -> None:
+ def register(self, cls: type[VersionControl]) -> None:
if not hasattr(cls, "name"):
logger.warning("Cannot register VCS %s", cls.__name__)
return
@@ -209,7 +205,7 @@ def unregister(self, name: str) -> None:
if name in self._registry:
del self._registry[name]
- def get_backend_for_dir(self, location: str) -> Optional["VersionControl"]:
+ def get_backend_for_dir(self, location: str) -> VersionControl | None:
"""
Return a VersionControl object if a repository of that type is found
at the given directory.
@@ -232,7 +228,7 @@ def get_backend_for_dir(self, location: str) -> Optional["VersionControl"]:
inner_most_repo_path = max(vcs_backends, key=len)
return vcs_backends[inner_most_repo_path]
- def get_backend_for_scheme(self, scheme: str) -> Optional["VersionControl"]:
+ def get_backend_for_scheme(self, scheme: str) -> VersionControl | None:
"""
Return a VersionControl object or None.
"""
@@ -241,7 +237,7 @@ def get_backend_for_scheme(self, scheme: str) -> Optional["VersionControl"]:
return vcs_backend
return None
- def get_backend(self, name: str) -> Optional["VersionControl"]:
+ def get_backend(self, name: str) -> VersionControl | None:
"""
Return a VersionControl object or None.
"""
@@ -257,10 +253,10 @@ class VersionControl:
dirname = ""
repo_name = ""
# List of supported schemes for this Version Control
- schemes: Tuple[str, ...] = ()
+ schemes: tuple[str, ...] = ()
# Iterable of environment variable names to pass to call_subprocess().
- unset_environ: Tuple[str, ...] = ()
- default_arg_rev: Optional[str] = None
+ unset_environ: tuple[str, ...] = ()
+ default_arg_rev: str | None = None
@classmethod
def should_add_vcs_url_prefix(cls, remote_url: str) -> bool:
@@ -271,7 +267,7 @@ def should_add_vcs_url_prefix(cls, remote_url: str) -> bool:
return not remote_url.lower().startswith(f"{cls.name}:")
@classmethod
- def get_subdirectory(cls, location: str) -> Optional[str]:
+ def get_subdirectory(cls, location: str) -> str | None:
"""
Return the path to Python project root, relative to the repo root.
Return None if the project root is in the repo root.
@@ -310,7 +306,7 @@ def get_src_requirement(cls, repo_dir: str, project_name: str) -> str:
return req
@staticmethod
- def get_base_rev_args(rev: str) -> List[str]:
+ def get_base_rev_args(rev: str) -> list[str]:
"""
Return the base revision arguments for a vcs command.
@@ -334,7 +330,7 @@ def is_immutable_rev_checkout(self, url: str, dest: str) -> bool:
@classmethod
def make_rev_options(
- cls, rev: Optional[str] = None, extra_args: Optional[CommandArgs] = None
+ cls, rev: str | None = None, extra_args: CommandArgs | None = None
) -> RevOptions:
"""
Return a RevOptions object.
@@ -357,7 +353,7 @@ def _is_local_repository(cls, repo: str) -> bool:
@classmethod
def get_netloc_and_auth(
cls, netloc: str, scheme: str
- ) -> Tuple[str, Tuple[Optional[str], Optional[str]]]:
+ ) -> tuple[str, tuple[str | None, str | None]]:
"""
Parse the repository URL's netloc, and return the new netloc to use
along with auth information.
@@ -376,7 +372,7 @@ def get_netloc_and_auth(
return netloc, (None, None)
@classmethod
- def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
+ def get_url_rev_and_auth(cls, url: str) -> tuple[str, str | None, AuthInfo]:
"""
Parse the repository URL to use, and return the URL, revision,
and auth info to use.
@@ -402,26 +398,25 @@ def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
"which is not supported. Include a revision after @ "
"or remove @ from the URL."
)
+ rev = urllib.parse.unquote(rev)
url = urllib.parse.urlunsplit((scheme, netloc, path, query, ""))
return url, rev, user_pass
@staticmethod
- def make_rev_args(
- username: Optional[str], password: Optional[HiddenText]
- ) -> CommandArgs:
+ def make_rev_args(username: str | None, password: HiddenText | None) -> CommandArgs:
"""
Return the RevOptions "extra arguments" to use in obtain().
"""
return []
- def get_url_rev_options(self, url: HiddenText) -> Tuple[HiddenText, RevOptions]:
+ def get_url_rev_options(self, url: HiddenText) -> tuple[HiddenText, RevOptions]:
"""
Return the URL and RevOptions object to use in obtain(),
as a tuple (url, rev_options).
"""
secret_url, rev, user_pass = self.get_url_rev_and_auth(url.secret)
username, secret_password = user_pass
- password: Optional[HiddenText] = None
+ password: HiddenText | None = None
if secret_password is not None:
password = hide_value(secret_password)
extra_args = self.make_rev_args(username, password)
@@ -458,7 +453,13 @@ def fetch_new(
"""
raise NotImplementedError
- def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ def switch(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
"""
Switch the repo at ``dest`` to point to ``URL``.
@@ -467,7 +468,13 @@ def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
"""
raise NotImplementedError
- def update(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
+ def update(
+ self,
+ dest: str,
+ url: HiddenText,
+ rev_options: RevOptions,
+ verbosity: int = 0,
+ ) -> None:
"""
Update an already-existing repo to the given ``rev_options``.
@@ -477,7 +484,7 @@ def update(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
raise NotImplementedError
@classmethod
- def is_commit_id_equal(cls, dest: str, name: Optional[str]) -> bool:
+ def is_commit_id_equal(cls, dest: str, name: str | None) -> bool:
"""
Return whether the id of the current commit equals the given name.
@@ -519,7 +526,7 @@ def obtain(self, dest: str, url: HiddenText, verbosity: int) -> None:
self.repo_name,
rev_display,
)
- self.update(dest, url, rev_options)
+ self.update(dest, url, rev_options, verbosity=verbosity)
else:
logger.info("Skipping because already up-to-date.")
return
@@ -574,7 +581,7 @@ def obtain(self, dest: str, url: HiddenText, verbosity: int) -> None:
url,
rev_display,
)
- self.switch(dest, url, rev_options)
+ self.switch(dest, url, rev_options, verbosity=verbosity)
def unpack(self, location: str, url: HiddenText, verbosity: int) -> None:
"""
@@ -608,14 +615,14 @@ def get_revision(cls, location: str) -> str:
@classmethod
def run_command(
cls,
- cmd: Union[List[str], CommandArgs],
+ cmd: list[str] | CommandArgs,
show_stdout: bool = True,
- cwd: Optional[str] = None,
- on_returncode: 'Literal["raise", "warn", "ignore"]' = "raise",
- extra_ok_returncodes: Optional[Iterable[int]] = None,
- command_desc: Optional[str] = None,
- extra_environ: Optional[Mapping[str, Any]] = None,
- spinner: Optional[SpinnerInterface] = None,
+ cwd: str | None = None,
+ on_returncode: Literal["raise", "warn", "ignore"] = "raise",
+ extra_ok_returncodes: Iterable[int] | None = None,
+ command_desc: str | None = None,
+ extra_environ: Mapping[str, Any] | None = None,
+ spinner: SpinnerInterface | None = None,
log_failed_cmd: bool = True,
stdout_only: bool = False,
) -> str:
@@ -672,7 +679,7 @@ def is_repository_directory(cls, path: str) -> bool:
return os.path.exists(os.path.join(path, cls.dirname))
@classmethod
- def get_repository_root(cls, location: str) -> Optional[str]:
+ def get_repository_root(cls, location: str) -> str | None:
"""
Return the "root" (top-level) directory controlled by the vcs,
or `None` if the directory is not in any.
diff --git a/addons/source-python/packages/site-packages/pip/_internal/wheel_builder.py b/addons/source-python/packages/site-packages/pip/_internal/wheel_builder.py
index 93f8e1f5b..4dbf76778 100644
--- a/addons/source-python/packages/site-packages/pip/_internal/wheel_builder.py
+++ b/addons/source-python/packages/site-packages/pip/_internal/wheel_builder.py
@@ -1,11 +1,12 @@
-"""Orchestrator for building wheels from InstallRequirements.
-"""
+"""Orchestrator for building wheels from InstallRequirements."""
+
+from __future__ import annotations
import logging
import os.path
import re
-import shutil
-from typing import Iterable, List, Optional, Tuple
+from collections.abc import Iterable
+from tempfile import TemporaryDirectory
from pip._vendor.packaging.utils import canonicalize_name, canonicalize_version
from pip._vendor.packaging.version import InvalidVersion, Version
@@ -17,13 +18,9 @@
from pip._internal.models.wheel import Wheel
from pip._internal.operations.build.wheel import build_wheel_pep517
from pip._internal.operations.build.wheel_editable import build_wheel_editable
-from pip._internal.operations.build.wheel_legacy import build_wheel_legacy
from pip._internal.req.req_install import InstallRequirement
from pip._internal.utils.logging import indent_log
from pip._internal.utils.misc import ensure_dir, hash_file
-from pip._internal.utils.setuptools_build import make_setuptools_clean_args
-from pip._internal.utils.subprocess import call_subprocess
-from pip._internal.utils.temp_dir import TempDirectory
from pip._internal.utils.urls import path_to_url
from pip._internal.vcs import vcs
@@ -31,7 +28,7 @@
_egg_info_re = re.compile(r"([a-z0-9_.]+)-([a-z0-9_.!+-]+)", re.IGNORECASE)
-BuildResult = Tuple[List[InstallRequirement], List[InstallRequirement]]
+BuildResult = tuple[list[InstallRequirement], list[InstallRequirement]]
def _contains_egg_info(s: str) -> bool:
@@ -42,58 +39,12 @@ def _contains_egg_info(s: str) -> bool:
return bool(_egg_info_re.search(s))
-def _should_build(
- req: InstallRequirement,
- 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
- 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
-
- if req.editable:
- # we only build PEP 660 editable requirements
- return req.supports_pyproject_editable
-
- 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:
- return _should_build(req, need_wheel=False)
-
-
def _should_cache(
req: InstallRequirement,
-) -> Optional[bool]:
+) -> bool | None:
"""
Return whether a built InstallRequirement can be stored in the persistent
- wheel cache, assuming the wheel cache is available, and _should_build()
- has determined a wheel needs to be built.
+ wheel cache, assuming the wheel cache is available.
"""
if req.editable or not req.source_dir:
# never cache editable requirements
@@ -138,7 +89,7 @@ def _get_cache_dir(
def _verify_one(req: InstallRequirement, wheel_path: str) -> None:
canonical_name = canonicalize_name(req.name or "")
w = Wheel(os.path.basename(wheel_path))
- if canonicalize_name(w.name) != canonical_name:
+ if w.name != canonical_name:
raise InvalidWheelFilename(
f"Wheel has unexpected file name: expected {canonical_name!r}, "
f"got {w.name!r}",
@@ -168,10 +119,8 @@ def _build_one(
req: InstallRequirement,
output_dir: str,
verify: bool,
- build_options: List[str],
- global_options: List[str],
editable: bool,
-) -> Optional[str]:
+) -> str | None:
"""Build one wheel.
:return: The filename of the built wheel, or None if the build failed.
@@ -190,9 +139,7 @@ def _build_one(
# Install build deps into temporary directory (PEP 518)
with req.build_env:
- wheel_path = _build_one_inside_env(
- req, output_dir, build_options, global_options, editable
- )
+ wheel_path = _build_one_inside_env(req, output_dir, editable)
if wheel_path and verify:
try:
_verify_one(req, wheel_path)
@@ -205,45 +152,25 @@ def _build_one(
def _build_one_inside_env(
req: InstallRequirement,
output_dir: str,
- build_options: List[str],
- global_options: List[str],
editable: bool,
-) -> Optional[str]:
- with TempDirectory(kind="wheel") as temp_dir:
+) -> str | None:
+ with TemporaryDirectory(dir=output_dir) as wheel_directory:
assert req.name
- if req.use_pep517:
- assert req.metadata_directory
- assert req.pep517_backend
- if global_options:
- logger.warning(
- "Ignoring --global-option when building %s using PEP 517", req.name
- )
- if build_options:
- logger.warning(
- "Ignoring --build-option when building %s using PEP 517", req.name
- )
- if editable:
- wheel_path = build_wheel_editable(
- name=req.name,
- backend=req.pep517_backend,
- metadata_directory=req.metadata_directory,
- tempd=temp_dir.path,
- )
- else:
- wheel_path = build_wheel_pep517(
- name=req.name,
- backend=req.pep517_backend,
- metadata_directory=req.metadata_directory,
- tempd=temp_dir.path,
- )
+ assert req.metadata_directory
+ assert req.pep517_backend
+ if editable:
+ wheel_path = build_wheel_editable(
+ name=req.name,
+ backend=req.pep517_backend,
+ metadata_directory=req.metadata_directory,
+ wheel_directory=wheel_directory,
+ )
else:
- wheel_path = build_wheel_legacy(
+ wheel_path = build_wheel_pep517(
name=req.name,
- setup_py_path=req.setup_py_path,
- source_dir=req.unpacked_source_directory,
- global_options=global_options,
- build_options=build_options,
- tempd=temp_dir.path,
+ backend=req.pep517_backend,
+ metadata_directory=req.metadata_directory,
+ wheel_directory=wheel_directory,
)
if wheel_path is not None:
@@ -251,7 +178,11 @@ def _build_one_inside_env(
dest_path = os.path.join(output_dir, wheel_name)
try:
wheel_hash, length = hash_file(wheel_path)
- shutil.move(wheel_path, dest_path)
+ # We can do a replace here because wheel_path is guaranteed to
+ # be in the same filesystem as output_dir. This will perform an
+ # atomic rename, which is necessary to avoid concurrency issues
+ # when populating the cache.
+ os.replace(wheel_path, dest_path)
logger.info(
"Created wheel for %s: filename=%s size=%d sha256=%s",
req.name,
@@ -267,35 +198,13 @@ def _build_one_inside_env(
req.name,
e,
)
- # Ignore return, we can't do anything else useful.
- if not req.use_pep517:
- _clean_one_legacy(req, global_options)
return None
-def _clean_one_legacy(req: InstallRequirement, global_options: List[str]) -> bool:
- clean_args = make_setuptools_clean_args(
- req.setup_py_path,
- global_options=global_options,
- )
-
- logger.info("Running setup.py clean for %s", req.name)
- try:
- call_subprocess(
- clean_args, command_desc="python setup.py clean", cwd=req.source_dir
- )
- return True
- except Exception:
- logger.error("Failed cleaning build dir for %s", req.name)
- return False
-
-
def build(
requirements: Iterable[InstallRequirement],
wheel_cache: WheelCache,
verify: bool,
- build_options: List[str],
- global_options: List[str],
) -> BuildResult:
"""Build wheels.
@@ -320,8 +229,6 @@ def build(
req,
cache_dir,
verify,
- build_options,
- global_options,
req.editable and req.permit_editable_wheels,
)
if wheel_file:
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/README.rst b/addons/source-python/packages/site-packages/pip/_vendor/README.rst
new file mode 100644
index 000000000..a925e8cc6
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/README.rst
@@ -0,0 +1,180 @@
+================
+Vendoring Policy
+================
+
+* Vendored libraries **MUST** not be modified except as required to
+ successfully vendor them.
+* Vendored libraries **MUST** be released copies of libraries available on
+ PyPI.
+* Vendored libraries **MUST** be available under a license that allows
+ them to be integrated into ``pip``, which is released under the MIT license.
+* Vendored libraries **MUST** be accompanied with LICENSE files.
+* The versions of libraries vendored in pip **MUST** be reflected in
+ ``pip/_vendor/vendor.txt``.
+* Vendored libraries **MUST** function without any build steps such as ``2to3``
+ or compilation of C code, practically this limits to single source 2.x/3.x and
+ pure Python.
+* Any modifications made to libraries **MUST** be noted in
+ ``pip/_vendor/README.rst`` and their corresponding patches **MUST** be
+ included ``tools/vendoring/patches``.
+* Vendored libraries should have corresponding ``vendored()`` entries in
+ ``pip/_vendor/__init__.py``.
+
+Rationale
+=========
+
+Historically pip has not had any dependencies except for ``setuptools`` itself,
+choosing instead to implement any functionality it needed to prevent needing
+a dependency. However, starting with pip 1.5, we began to replace code that was
+implemented inside of pip with reusable libraries from PyPI. This brought the
+typical benefits of reusing libraries instead of reinventing the wheel like
+higher quality and more battle tested code, centralization of bug fixes
+(particularly security sensitive ones), and better/more features for less work.
+
+However, there are several issues with having dependencies in the traditional
+way (via ``install_requires``) for pip. These issues are:
+
+**Fragility**
+ When pip depends on another library to function then if for whatever reason
+ that library either isn't installed or an incompatible version is installed
+ then pip ceases to function. This is of course true for all Python
+ applications, however for every application *except* for pip the way you fix
+ it is by re-running pip. Obviously, when pip can't run, you can't use pip to
+ fix pip, so you're left having to manually resolve dependencies and
+ installing them by hand.
+
+**Making other libraries uninstallable**
+ One of pip's current dependencies is the ``requests`` library, for which pip
+ requires a fairly recent version to run. If pip depended on ``requests`` in
+ the traditional manner, then we'd either have to maintain compatibility with
+ every ``requests`` version that has ever existed (and ever will), OR allow
+ pip to render certain versions of ``requests`` uninstallable. (The second
+ issue, although technically true for any Python application, is magnified by
+ pip's ubiquity; pip is installed by default in Python, in ``pyvenv``, and in
+ ``virtualenv``.)
+
+**Security**
+ This might seem puzzling at first glance, since vendoring has a tendency to
+ complicate updating dependencies for security updates, and that holds true
+ for pip. However, given the *other* reasons for avoiding dependencies, the
+ alternative is for pip to reinvent the wheel itself. This is what pip did
+ historically. It forced pip to re-implement its own HTTPS verification
+ routines as a workaround for the Python standard library's lack of SSL
+ validation, which resulted in similar bugs in the validation routine in
+ ``requests`` and ``urllib3``, except that they had to be discovered and
+ fixed independently. Even though we're vendoring, reusing libraries keeps
+ pip more secure by relying on the great work of our dependencies, *and*
+ allowing for faster, easier security fixes by simply pulling in newer
+ versions of dependencies.
+
+**Bootstrapping**
+ Currently most popular methods of installing pip rely on pip's
+ self-contained nature to install pip itself. These tools work by bundling a
+ copy of pip, adding it to ``sys.path``, and then executing that copy of pip.
+ This is done instead of implementing a "mini installer" (to reduce
+ duplication); pip already knows how to install a Python package, and is far
+ more battle-tested than any "mini installer" could ever possibly be.
+
+Many downstream redistributors have policies against this kind of bundling, and
+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.
+
+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
+problems that are unreasonable then we would be happy to consider, and possibly
+switch to said method. This solution must function correctly across all of the
+situation that we expect pip to be used and not mandate some external mechanism
+such as OS packages.
+
+
+Modifications
+=============
+
+* ``setuptools`` is completely stripped to only keep ``pkg_resources``.
+* ``pkg_resources`` has been modified to import its dependencies from
+ ``pip._vendor``, and to use the vendored copy of ``platformdirs``
+ rather than ``appdirs``.
+* ``packaging`` has been modified to import its dependencies from
+ ``pip._vendor``.
+* ``CacheControl`` has been modified to import its dependencies from
+ ``pip._vendor``.
+* ``requests`` has been modified to import its other dependencies from
+ ``pip._vendor`` and to *not* load ``simplejson`` (all platforms) and
+ ``pyopenssl`` (Windows).
+* ``platformdirs`` has been modified to import its submodules from ``pip._vendor.platformdirs``.
+
+Automatic Vendoring
+===================
+
+Vendoring is automated via the `vendoring `_ tool from the content of
+``pip/_vendor/vendor.txt`` and the different patches in
+``tools/vendoring/patches``.
+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
+======================
+
+The ``vendoring`` tool automatically applies our local patches, but updating,
+the patches sometimes no longer apply cleanly. In that case, the update will
+fail. To resolve this, take the following steps:
+
+1. Revert any incomplete changes in the revendoring branch, to ensure you have
+ a clean starting point.
+2. Run the revendoring of the library with a problem again: ``nox -s vendoring
+ -- --upgrade ``.
+3. This will fail again, but you will have the original source in your working
+ directory. Review the existing patch against the source, and modify the patch
+ to reflect the new version of the source. If you ``git add`` the changes the
+ vendoring made, you can modify the source to reflect the patch file and then
+ generate a new patch with ``git diff``.
+4. Now, revert everything *except* the patch file changes. Leave the modified
+ patch file unstaged but saved in the working tree.
+5. Re-run the vendoring. This time, it should pick up the changed patch file
+ and apply it cleanly. The patch file changes will be committed along with the
+ revendoring, so the new commit should be ready to test and publish as a PR.
+
+
+Debundling
+==========
+
+As mentioned in the rationale, we, the pip team, would prefer it if pip was not
+debundled (other than optionally ``pip/_vendor/requests/cacert.pem``) and that
+pip was left intact. However, if you insist on doing so, we have a
+semi-supported method (that we don't test in our CI) and requires a bit of
+extra work on your end in order to solve the problems described above.
+
+1. Delete everything in ``pip/_vendor/`` **except** for
+ ``pip/_vendor/__init__.py`` and ``pip/_vendor/vendor.txt``.
+2. Generate wheels for each of pip's dependencies (and any of their
+ dependencies) using your patched copies of these libraries. These must be
+ placed somewhere on the filesystem that pip can access (``pip/_vendor`` is
+ the default assumption).
+3. Modify ``pip/_vendor/__init__.py`` so that the ``DEBUNDLED`` variable is
+ ``True``.
+4. Upon installation, the ``INSTALLER`` file in pip's own ``dist-info``
+ directory should be set to something other than ``pip``, so that pip
+ can detect that it wasn't installed using itself.
+5. *(optional)* If you've placed the wheels in a location other than
+ ``pip/_vendor/``, then modify ``pip/_vendor/__init__.py`` so that the
+ ``WHEEL_DIR`` variable points to the location you've placed them.
+6. *(optional)* Update the ``pip_self_version_check`` logic to use the
+ appropriate logic for determining the latest available version of pip and
+ prompt the user with the correct upgrade message.
+
+Note that partial debundling is **NOT** supported. You need to prepare wheels
+for all dependencies for successful debundling.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/__init__.py
index 561089ccc..34ccb9907 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/LICENSE.txt b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/LICENSE.txt
new file mode 100644
index 000000000..d8b3b56d3
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/LICENSE.txt
@@ -0,0 +1,13 @@
+Copyright 2012-2021 Eric Larson
+
+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.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/__init__.py
index 21916243c..3f8c36f67 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/__init__.py
@@ -7,14 +7,17 @@
Make it easy to import from cachecontrol without long namespaces.
"""
-__author__ = "Eric Larson"
-__email__ = "eric@ionrock.org"
-__version__ = "0.14.1"
+import importlib.metadata
from pip._vendor.cachecontrol.adapter import CacheControlAdapter
from pip._vendor.cachecontrol.controller import CacheController
from pip._vendor.cachecontrol.wrapper import CacheControl
+__author__ = "Eric Larson"
+__email__ = "eric@ionrock.org"
+# pip patch: this won't work when vendored, so just patch it out as it's unused
+# __version__ = importlib.metadata.version("cachecontrol")
+
__all__ = [
"__author__",
"__email__",
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/adapter.py b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/adapter.py
index 34a9eb827..01f125362 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/adapter.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/adapter.py
@@ -4,7 +4,7 @@
from __future__ import annotations
import functools
-import types
+import weakref
import zlib
from typing import TYPE_CHECKING, Any, Collection, Mapping
@@ -128,19 +128,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/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/caches/file_cache.py b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/caches/file_cache.py
index 81d2ef46c..45c632c7f 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/caches/file_cache.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/controller.py b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/controller.py
index f0ff6e1be..0bf380136 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/controller.py
+++ b/addons/source-python/packages/site-packages/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
@@ -479,7 +490,7 @@ def update_cached_response(
#
# The server isn't supposed to send headers that would make
# the cached body invalid. But... just in case, we'll be sure
- # to strip out ones we know that might be problmatic due to
+ # to strip out ones we know that might be problematic due to
# typical assumptions.
excluded_headers = ["content-length"]
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/filewrapper.py b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/filewrapper.py
index 37d2fa591..6569fb5cd 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/filewrapper.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/cachecontrol/filewrapper.py
@@ -8,6 +8,7 @@
from typing import TYPE_CHECKING, Any, Callable
if TYPE_CHECKING:
+ from collections.abc import Buffer
from http.client import HTTPResponse
@@ -31,7 +32,7 @@ class CallbackFileWrapper:
"""
def __init__(
- self, fp: HTTPResponse, callback: Callable[[bytes], None] | None
+ self, fp: HTTPResponse, callback: Callable[[Buffer], None] | None
) -> None:
self.__buf = NamedTemporaryFile("rb+", delete=True)
self.__fp = fp
@@ -68,6 +69,7 @@ def __is_fp_closed(self) -> bool:
return False
def _close(self) -> None:
+ result: Buffer
if self.__callback:
if self.__buf.tell() == 0:
# Empty file:
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/certifi/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/certifi/LICENSE
new file mode 100644
index 000000000..62b076cde
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/certifi/LICENSE
@@ -0,0 +1,20 @@
+This package contains a modified version of ca-bundle.crt:
+
+ca-bundle.crt -- Bundle of CA Root Certificates
+
+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:
+https://hg.mozilla.org/mozilla-central/file/tip/security/nss/lib/ckfw/builtins/certdata.txt
+It contains the certificates in PEM format and therefore
+can be directly used with curl / libcurl / php_curl, or with
+an Apache+mod_ssl webserver for SSL client authentication.
+Just configure this file as the SSLCACertificateFile.#
+
+***** BEGIN LICENSE BLOCK *****
+This Source Code Form is subject to the terms of the Mozilla Public License,
+v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
+one at http://mozilla.org/MPL/2.0/.
+
+***** END LICENSE BLOCK *****
+@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/certifi/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/certifi/__init__.py
index f61d77fa3..090fd5848 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/certifi/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/certifi/__init__.py
@@ -1,4 +1,4 @@
from .core import contents, where
__all__ = ["contents", "where"]
-__version__ = "2024.08.30"
+__version__ = "2026.01.04"
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/certifi/cacert.pem b/addons/source-python/packages/site-packages/pip/_vendor/certifi/cacert.pem
index 3c165a1b8..132db0df1 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/certifi/cacert.pem
+++ b/addons/source-python/packages/site-packages/pip/_vendor/certifi/cacert.pem
@@ -1,163 +1,4 @@
-# Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
-# Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
-# Label: "GlobalSign Root CA"
-# Serial: 4835703278459707669005204
-# MD5 Fingerprint: 3e:45:52:15:09:51:92:e1:b7:5d:37:9f:b1:87:29:8a
-# SHA1 Fingerprint: b1:bc:96:8b:d4:f4:9d:62:2a:a8:9a:81:f2:15:01:52:a4:1d:82:9c
-# SHA256 Fingerprint: eb:d4:10:40:e4:bb:3e:c7:42:c9:e3:81:d3:1e:f2:a4:1a:48:b6:68:5c:96:e7:ce:f3:c1:df:6c:d4:33:1c:99
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
-AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
-yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
-38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
-AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
-DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
-HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Label: "Entrust.net Premium 2048 Secure Server CA"
-# Serial: 946069240
-# MD5 Fingerprint: ee:29:31:bc:32:7e:9a:e6:e8:b5:f7:51:b4:34:71:90
-# SHA1 Fingerprint: 50:30:06:09:1d:97:d4:f5:ae:39:f7:cb:e7:92:7d:7d:65:2d:34:31
-# SHA256 Fingerprint: 6d:c4:71:72:e0:1c:bc:b0:bf:62:58:0d:89:5f:e2:b8:ac:9a:d4:f8:73:80:1e:0c:10:b9:c8:37:d2:1e:b1:77
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
-RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
-bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
-IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
-MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
-LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
-YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
-A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
-K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
-sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
-MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
-XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
-HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
-4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
-j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
-U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
-u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
-bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
-fF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Label: "Baltimore CyberTrust Root"
-# Serial: 33554617
-# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
-# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
-# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Label: "Entrust Root Certification Authority"
-# Serial: 1164660820
-# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
-# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
-# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
-Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
-KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
-NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
-NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
-ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
-BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
-Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
-4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
-KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
-rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
-94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
-sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
-gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
-kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
-vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
-O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
-AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
-9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
-eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
-0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
-# Subject: CN=AAA Certificate Services O=Comodo CA Limited
-# Label: "Comodo AAA Services root"
-# Serial: 1
-# MD5 Fingerprint: 49:79:04:b0:eb:87:19:ac:47:b0:bc:11:51:9b:74:d0
-# SHA1 Fingerprint: d1:eb:23:a4:6d:17:d6:8f:d9:25:64:c2:f1:f1:60:17:64:d8:e3:49
-# SHA256 Fingerprint: d7:a7:a0:fb:5d:7e:27:31:d7:71:e9:48:4e:bc:de:f7:1d:5f:0c:3e:0a:29:48:78:2b:c8:3e:e0:ea:69:9e:f4
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
-YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
-GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
-BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
-3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
-YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
-rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
-ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
-b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
-AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
-GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
-G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
-l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
-smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
# Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
# Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
# Label: "QuoVadis Root CA 2"
@@ -245,103 +86,6 @@ mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
4SVhM7JZG+Ju1zdXtg2pEto=
-----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"
-# Serial: 107108908803651509692980124233745014957
-# MD5 Fingerprint: a1:0b:44:b3:ca:10:d8:00:6e:9d:0f:d8:0f:92:0a:d1
-# SHA1 Fingerprint: b8:01:86:d1:eb:9c:86:a5:41:04:cf:30:54:f3:4c:52:b7:e5:58:c6
-# SHA256 Fingerprint: ce:cd:dc:90:50:99:d8:da:df:c5:b1:d2:09:b7:37:cb:e2:c1:8c:fb:2c:10:c0:ff:0b:cf:0d:32:86:fc:1a:a2
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
-gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
-MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
-UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
-NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
-dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
-dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
-38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
-KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
-DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
-qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
-JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
-PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
-BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
-jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
-eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
-vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
-IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
-i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
-O+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-# Issuer: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
-# Subject: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
-# Label: "Go Daddy Class 2 CA"
-# Serial: 0
-# MD5 Fingerprint: 91:de:06:25:ab:da:fd:32:17:0c:bb:25:17:2a:84:67
-# SHA1 Fingerprint: 27:96:ba:e6:3f:18:01:e2:77:26:1b:a0:d7:77:70:02:8f:20:ee:e4
-# SHA256 Fingerprint: c3:84:6b:f2:4b:9e:93:ca:64:27:4c:0e:c6:7c:1e:cc:5e:02:4f:fc:ac:d2:d7:40:19:35:0e:81:fe:54:6a:e4
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
-MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
-YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
-MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
-ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
-MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
-ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
-PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
-wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
-EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
-avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
-YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
-sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
-/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
-IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
-OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
-TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
-dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
-ReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----
-
-# Issuer: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
-# Subject: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
-# Label: "Starfield Class 2 CA"
-# Serial: 0
-# MD5 Fingerprint: 32:4a:4b:bb:c8:63:69:9b:be:74:9a:c6:dd:1d:46:24
-# SHA1 Fingerprint: ad:7e:1c:28:b0:64:ef:8f:60:03:40:20:14:c3:d0:e3:37:0e:b5:8a
-# SHA256 Fingerprint: 14:65:fa:20:53:97:b8:76:fa:a6:f0:a9:95:8e:55:90:e4:0f:cc:7f:aa:4f:b7:c2:c8:67:75:21:fb:5f:b6:58
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
-MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
-U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
-NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
-ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
-ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
-DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
-8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
-+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
-X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
-K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
-1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
-A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
-zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
-YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
-bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
-L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
-eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
-VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
-WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
# Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
# Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
# Label: "DigiCert Assured ID Root CA"
@@ -474,47 +218,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 +466,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"
@@ -989,122 +663,6 @@ iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
sSi6
-----END CERTIFICATE-----
-# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
-# Subject: CN=AffirmTrust Commercial O=AffirmTrust
-# Label: "AffirmTrust Commercial"
-# Serial: 8608355977964138876
-# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
-# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
-# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
-Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
-ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
-MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
-yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
-VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
-nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
-XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
-vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
-Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
-N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
-nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Networking O=AffirmTrust
-# Subject: CN=AffirmTrust Networking O=AffirmTrust
-# Label: "AffirmTrust Networking"
-# Serial: 8957382827206547757
-# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
-# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
-# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
-YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
-kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
-QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
-6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
-yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
-QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
-tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
-QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
-Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
-olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
-x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium O=AffirmTrust
-# Subject: CN=AffirmTrust Premium O=AffirmTrust
-# Label: "AffirmTrust Premium"
-# Serial: 7893706540734352110
-# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
-# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
-# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
-dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
-A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
-cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
-qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
-JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
-+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
-s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
-HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
-70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
-V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
-qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
-5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
-C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
-OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
-FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
-KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
-8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
-MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
-0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
-u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
-u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
-YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
-GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
-RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
-KeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Label: "AffirmTrust Premium ECC"
-# Serial: 8401224907861490260
-# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
-# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
-# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
-VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
-cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
-BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
-VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
-0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
-ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
-A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
-aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
-flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
------END CERTIFICATE-----
-
# Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
# Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
# Label: "Certum Trusted Network CA"
@@ -2108,65 +1666,6 @@ GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv
8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c
-----END CERTIFICATE-----
-# Issuer: CN=Entrust Root Certification Authority - G2 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2009 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - G2 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2009 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - G2"
-# Serial: 1246989352
-# MD5 Fingerprint: 4b:e2:c9:91:96:65:0c:f4:0e:5a:93:92:a0:0a:fe:b2
-# SHA1 Fingerprint: 8c:f4:27:fd:79:0c:3a:d1:66:06:8d:e8:1e:57:ef:bb:93:22:72:d4
-# SHA256 Fingerprint: 43:df:57:74:b0:3e:7f:ef:5f:e4:0d:93:1a:7b:ed:f1:bb:2e:6b:42:73:8c:4e:6d:38:41:10:3d:3a:a7:f3:39
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
-cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
-IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
-dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
-NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
-dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
-dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
-aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
-RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
-cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
-wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
-U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
-jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
-BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
-jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
-1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
-nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
-VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust Root Certification Authority - EC1 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2012 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - EC1 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2012 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - EC1"
-# Serial: 51543124481930649114116133369
-# MD5 Fingerprint: b6:7e:1d:f0:58:c5:49:6c:24:3b:3d:ed:98:18:ed:bc
-# SHA1 Fingerprint: 20:d8:06:40:df:9b:25:f5:12:25:3a:11:ea:f7:59:8a:eb:14:b5:47
-# SHA256 Fingerprint: 02:ed:0e:b2:8c:14:da:45:16:5c:56:67:91:70:0d:64:51:d7:fb:56:f0:b2:ab:1d:3b:8e:b0:70:e5:6e:df:f5
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG
-A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3
-d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu
-dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq
-RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy
-MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD
-VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
-L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g
-Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi
-A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt
-ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH
-Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC
-R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX
-hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
-
# Issuer: CN=CFCA EV ROOT O=China Financial Certification Authority
# Subject: CN=CFCA EV ROOT O=China Financial Certification Authority
# Label: "CFCA EV ROOT"
@@ -3100,50 +2599,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"
@@ -4214,46 +3669,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"
@@ -4587,128 +4002,6 @@ 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"
@@ -4927,3 +4220,249 @@ 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=TrustAsia TLS ECC Root CA O=TrustAsia Technologies, Inc.
+# Subject: CN=TrustAsia TLS ECC Root CA O=TrustAsia Technologies, Inc.
+# Label: "TrustAsia TLS ECC Root CA"
+# Serial: 310892014698942880364840003424242768478804666567
+# MD5 Fingerprint: 09:48:04:77:d2:fc:65:93:71:66:b1:11:95:4f:06:8c
+# SHA1 Fingerprint: b5:ec:39:f3:a1:66:37:ae:c3:05:94:57:e2:be:11:be:b7:a1:7f:36
+# SHA256 Fingerprint: c0:07:6b:9e:f0:53:1f:b1:a6:56:d6:7c:4e:be:97:cd:5d:ba:a4:1e:f4:45:98:ac:c2:48:98:78:c9:2d:87:11
+-----BEGIN CERTIFICATE-----
+MIICMTCCAbegAwIBAgIUNnThTXxlE8msg1UloD5Sfi9QaMcwCgYIKoZIzj0EAwMw
+WDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMs
+IEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgRUNDIFJvb3QgQ0EwHhcNMjQw
+NTE1MDU0MTU2WhcNNDQwNTE1MDU0MTU1WjBYMQswCQYDVQQGEwJDTjElMCMGA1UE
+ChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEiMCAGA1UEAxMZVHJ1c3RB
+c2lhIFRMUyBFQ0MgUm9vdCBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABLh/pVs/
+AT598IhtrimY4ZtcU5nb9wj/1WrgjstEpvDBjL1P1M7UiFPoXlfXTr4sP/MSpwDp
+guMqWzJ8S5sUKZ74LYO1644xST0mYekdcouJtgq7nDM1D9rs3qlKH8kzsaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQULIVTu7FDzTLqnqOH/qKYqKaT6RAw
+DgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMFRH18MtYYZI9HlaVQ01
+L18N9mdsd0AaRuf4aFtOJx24mH1/k78ITcTaRTChD15KeAIxAKORh/IRM4PDwYqR
+OkwrULG9IpRdNYlzg8WbGf60oenUoWa2AaU2+dhoYSi3dOGiMQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TrustAsia TLS RSA Root CA O=TrustAsia Technologies, Inc.
+# Subject: CN=TrustAsia TLS RSA Root CA O=TrustAsia Technologies, Inc.
+# Label: "TrustAsia TLS RSA Root CA"
+# Serial: 160405846464868906657516898462547310235378010780
+# MD5 Fingerprint: 3b:9e:c3:86:0f:34:3c:6b:c5:46:c4:8e:1d:e7:19:12
+# SHA1 Fingerprint: a5:46:50:c5:62:ea:95:9a:1a:a7:04:6f:17:58:c7:29:53:3d:03:fa
+# SHA256 Fingerprint: 06:c0:8d:7d:af:d8:76:97:1e:b1:12:4f:e6:7f:84:7e:c0:c7:a1:58:d3:ea:53:cb:e9:40:e2:ea:97:91:f4:c3
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIUHBjYz+VTPyI1RlNUJDxsR9FcSpwwDQYJKoZIhvcNAQEM
+BQAwWDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgUlNBIFJvb3QgQ0EwHhcN
+MjQwNTE1MDU0MTU3WhcNNDQwNTE1MDU0MTU2WjBYMQswCQYDVQQGEwJDTjElMCMG
+A1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEiMCAGA1UEAxMZVHJ1
+c3RBc2lhIFRMUyBSU0EgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAMMWuBtqpERz5dZO9LnPWwvB0ZqB9WOwj0PBuwhaGnrhB3YmH49pVr7+
+NmDQDIPNlOrnxS1cLwUWAp4KqC/lYCZUlviYQB2srp10Zy9U+5RjmOMmSoPGlbYJ
+Q1DNDX3eRA5gEk9bNb2/mThtfWza4mhzH/kxpRkQcwUqwzIZheo0qt1CHjCNP561
+HmHVb70AcnKtEj+qpklz8oYVlQwQX1Fkzv93uMltrOXVmPGZLmzjyUT5tUMnCE32
+ft5EebuyjBza00tsLtbDeLdM1aTk2tyKjg7/D8OmYCYozza/+lcK7Fs/6TAWe8Tb
+xNRkoDD75f0dcZLdKY9BWN4ArTr9PXwaqLEX8E40eFgl1oUh63kd0Nyrz2I8sMeX
+i9bQn9P+PN7F4/w6g3CEIR0JwqH8uyghZVNgepBtljhb//HXeltt08lwSUq6HTrQ
+UNoyIBnkiz/r1RYmNzz7dZ6wB3C4FGB33PYPXFIKvF1tjVEK2sUYyJtt3LCDs3+j
+TnhMmCWr8n4uIF6CFabW2I+s5c0yhsj55NqJ4js+k8UTav/H9xj8Z7XvGCxUq0DT
+bE3txci3OE9kxJRMT6DNrqXGJyV1J23G2pyOsAWZ1SgRxSHUuPzHlqtKZFlhaxP8
+S8ySpg+kUb8OWJDZgoM5pl+z+m6Ss80zDoWo8SnTq1mt1tve1CuBAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLgHkXlcBvRG/XtZylomkadFK/hT
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAgEAIZtqBSBdGBanEqT3
+Rz/NyjuujsCCztxIJXgXbODgcMTWltnZ9r96nBO7U5WS/8+S4PPFJzVXqDuiGev4
+iqME3mmL5Dw8veWv0BIb5Ylrc5tvJQJLkIKvQMKtuppgJFqBTQUYo+IzeXoLH5Pt
+7DlK9RME7I10nYEKqG/odv6LTytpEoYKNDbdgptvT+Bz3Ul/KD7JO6NXBNiT2Twp
+2xIQaOHEibgGIOcberyxk2GaGUARtWqFVwHxtlotJnMnlvm5P1vQiJ3koP26TpUJ
+g3933FEFlJ0gcXax7PqJtZwuhfG5WyRasQmr2soaB82G39tp27RIGAAtvKLEiUUj
+pQ7hRGU+isFqMB3iYPg6qocJQrmBktwliJiJ8Xw18WLK7nn4GS/+X/jbh87qqA8M
+pugLoDzga5SYnH+tBuYc6kIQX+ImFTw3OffXvO645e8D7r0i+yiGNFjEWn9hongP
+XvPKnbwbPKfILfanIhHKA9jnZwqKDss1jjQ52MjqjZ9k4DewbNfFj8GQYSbbJIwe
+SsCI3zWQzj8C9GRh3sfIB5XeMhg6j6JCQCTl1jNdfK7vsU1P1FeQNWrcrgSXSYk0
+ly4wBOeY99sLAZDBHwo/+ML+TvrbmnNzFrwFuHnYWa8G5z9nODmxfKuU4CkUpijy
+323imttUQ/hHWKNddBWcwauwxzQ=
+-----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-----
+
+# Issuer: CN=SwissSign RSA TLS Root CA 2022 - 1 O=SwissSign AG
+# Subject: CN=SwissSign RSA TLS Root CA 2022 - 1 O=SwissSign AG
+# Label: "SwissSign RSA TLS Root CA 2022 - 1"
+# Serial: 388078645722908516278762308316089881486363258315
+# MD5 Fingerprint: 16:2e:e4:19:76:81:85:ba:8e:91:58:f1:15:ef:72:39
+# SHA1 Fingerprint: 81:34:0a:be:4c:cd:ce:cc:e7:7d:cc:8a:d4:57:e2:45:a0:77:5d:ce
+# SHA256 Fingerprint: 19:31:44:f4:31:e0:fd:db:74:07:17:d4:de:92:6a:57:11:33:88:4b:43:60:d3:0e:27:29:13:cb:e6:60:ce:41
+-----BEGIN CERTIFICATE-----
+MIIFkzCCA3ugAwIBAgIUQ/oMX04bgBhE79G0TzUfRPSA7cswDQYJKoZIhvcNAQEL
+BQAwUTELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzErMCkGA1UE
+AxMiU3dpc3NTaWduIFJTQSBUTFMgUm9vdCBDQSAyMDIyIC0gMTAeFw0yMjA2MDgx
+MTA4MjJaFw00NzA2MDgxMTA4MjJaMFExCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxT
+d2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3aXNzU2lnbiBSU0EgVExTIFJvb3QgQ0Eg
+MjAyMiAtIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDLKmjiC8NX
+vDVjvHClO/OMPE5Xlm7DTjak9gLKHqquuN6orx122ro10JFwB9+zBvKK8i5VUXu7
+LCTLf5ImgKO0lPaCoaTo+nUdWfMHamFk4saMla+ju45vVs9xzF6BYQ1t8qsCLqSX
+5XH8irCRIFucdFJtrhUnWXjyCcplDn/L9Ovn3KlMd/YrFgSVrpxxpT8q2kFC5zyE
+EPThPYxr4iuRR1VPuFa+Rd4iUU1OKNlfGUEGjw5NBuBwQCMBauTLE5tzrE0USJIt
+/m2n+IdreXXhvhCxqohAWVTXz8TQm0SzOGlkjIHRI36qOTw7D59Ke4LKa2/KIj4x
+0LDQKhySio/YGZxH5D4MucLNvkEM+KRHBdvBFzA4OmnczcNpI/2aDwLOEGrOyvi5
+KaM2iYauC8BPY7kGWUleDsFpswrzd34unYyzJ5jSmY0lpx+Gs6ZUcDj8fV3oT4MM
+0ZPlEuRU2j7yrTrePjxF8CgPBrnh25d7mUWe3f6VWQQvdT/TromZhqwUtKiE+shd
+OxtYk8EXlFXIC+OCeYSf8wCENO7cMdWP8vpPlkwGqnj73mSiI80fPsWMvDdUDrta
+clXvyFu1cvh43zcgTFeRc5JzrBh3Q4IgaezprClG5QtO+DdziZaKHG29777YtvTK
+wP1H8K4LWCDFyB02rpeNUIMmJCn3nTsPBQIDAQABo2MwYTAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBRvjmKLk0Ow4UD2p8P98Q+4
+DxU4pTAdBgNVHQ4EFgQUb45ii5NDsOFA9qfD/fEPuA8VOKUwDQYJKoZIhvcNAQEL
+BQADggIBAKwsKUF9+lz1GpUYvyypiqkkVHX1uECry6gkUSsYP2OprphWKwVDIqO3
+10aewCoSPY6WlkDfDDOLazeROpW7OSltwAJsipQLBwJNGD77+3v1dj2b9l4wBlgz
+Hqp41eZUBDqyggmNzhYzWUUo8aWjlw5DI/0LIICQ/+Mmz7hkkeUFjxOgdg3XNwwQ
+iJb0Pr6VvfHDffCjw3lHC1ySFWPtUnWK50Zpy1FVCypM9fJkT6lc/2cyjlUtMoIc
+gC9qkfjLvH4YoiaoLqNTKIftV+Vlek4ASltOU8liNr3CjlvrzG4ngRhZi0Rjn9UM
+ZfQpZX+RLOV/fuiJz48gy20HQhFRJjKKLjpHE7iNvUcNCfAWpO2Whi4Z2L6MOuhF
+LhG6rlrnub+xzI/goP+4s9GFe3lmozm1O2bYQL7Pt2eLSMkZJVX8vY3PXtpOpvJp
+zv1/THfQwUY1mFwjmwJFQ5Ra3bxHrSL+ul4vkSkphnsh3m5kt8sNjzdbowhq6/Td
+Ao9QAwKxuDdollDruF/UKIqlIgyKhPBZLtU30WHlQnNYKoH3dtvi4k0NX/a3vgW0
+rk4N3hY9A4GzJl5LuEsAz/+MF7psYC0nhzck5npgL7XTgwSqT0N1osGDsieYK7EO
+gLrAhV5Cud+xYJHT6xh+cHiudoO+cVrQkOPKwRYlZ0rwtnu64ZzZ
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE Server Root ECC G1 O=OISTE Foundation
+# Subject: CN=OISTE Server Root ECC G1 O=OISTE Foundation
+# Label: "OISTE Server Root ECC G1"
+# Serial: 47819833811561661340092227008453318557
+# MD5 Fingerprint: 42:a7:d2:35:ae:02:92:db:19:76:08:de:2f:05:b4:d4
+# SHA1 Fingerprint: 3b:f6:8b:09:ae:2a:92:7b:ba:e3:8d:3f:11:95:d9:e6:44:0c:45:e2
+# SHA256 Fingerprint: ee:c9:97:c0:c3:0f:21:6f:7e:3b:8b:30:7d:2b:ae:42:41:2d:75:3f:c8:21:9d:af:d1:52:0b:25:72:85:0f:49
+-----BEGIN CERTIFICATE-----
+MIICNTCCAbqgAwIBAgIQI/nD1jWvjyhLH/BU6n6XnTAKBggqhkjOPQQDAzBLMQsw
+CQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwY
+T0lTVEUgU2VydmVyIFJvb3QgRUNDIEcxMB4XDTIzMDUzMTE0NDIyOFoXDTQ4MDUy
+NDE0NDIyN1owSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5kYXRp
+b24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IEVDQyBHMTB2MBAGByqGSM49
+AgEGBSuBBAAiA2IABBcv+hK8rBjzCvRE1nZCnrPoH7d5qVi2+GXROiFPqOujvqQy
+cvO2Ackr/XeFblPdreqqLiWStukhEaivtUwL85Zgmjvn6hp4LrQ95SjeHIC6XG4N
+2xml4z+cKrhAS93mT6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBQ3
+TYhlz/w9itWj8UnATgwQb0K0nDAdBgNVHQ4EFgQUN02IZc/8PYrVo/FJwE4MEG9C
+tJwwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2kAMGYCMQCpKjAd0MKfkFFR
+QD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxgZzFDJe0CMQCSia7pXGKD
+YmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE Server Root RSA G1 O=OISTE Foundation
+# Subject: CN=OISTE Server Root RSA G1 O=OISTE Foundation
+# Label: " OISTE Server Root RSA G1"
+# Serial: 113845518112613905024960613408179309848
+# MD5 Fingerprint: 23:a7:9e:d4:70:b8:b9:14:57:41:8a:7e:44:59:e2:68
+# SHA1 Fingerprint: f7:00:34:25:94:88:68:31:e4:34:87:3f:70:fe:86:b3:86:9f:f0:6e
+# SHA256 Fingerprint: 9a:e3:62:32:a5:18:9f:fd:db:35:3d:fd:26:52:0c:01:53:95:d2:27:77:da:c5:9d:b5:7b:98:c0:89:a6:51:e6
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIQVaXZZ5Qoxu0M+ifdWwFNGDANBgkqhkiG9w0BAQwFADBL
+MQswCQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UE
+AwwYT0lTVEUgU2VydmVyIFJvb3QgUlNBIEcxMB4XDTIzMDUzMTE0MzcxNloXDTQ4
+MDUyNDE0MzcxNVowSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5k
+YXRpb24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IFJTQSBHMTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAKqu9KuCz/vlNwvn1ZatkOhLKdxVYOPM
+vLO8LZK55KN68YG0nnJyQ98/qwsmtO57Gmn7KNByXEptaZnwYx4M0rH/1ow00O7b
+rEi56rAUjtgHqSSY3ekJvqgiG1k50SeH3BzN+Puz6+mTeO0Pzjd8JnduodgsIUzk
+ik/HEzxux9UTl7Ko2yRpg1bTacuCErudG/L4NPKYKyqOBGf244ehHa1uzjZ0Dl4z
+O8vbUZeUapU8zhhabkvG/AePLhq5SvdkNCncpo1Q4Y2LS+VIG24ugBA/5J8bZT8R
+tOpXaZ+0AOuFJJkk9SGdl6r7NH8CaxWQrbueWhl/pIzY+m0o/DjH40ytas7ZTpOS
+jswMZ78LS5bOZmdTaMsXEY5Z96ycG7mOaES3GK/m5Q9l3JUJsJMStR8+lKXHiHUh
+sd4JJCpM4rzsTGdHwimIuQq6+cF0zowYJmXa92/GjHtoXAvuY8BeS/FOzJ8vD+Ho
+mnqT8eDI278n5mUpezbgMxVz8p1rhAhoKzYHKyfMeNhqhw5HdPSqoBNdZH702xSu
++zrkL8Fl47l6QGzwBrd7KJvX4V84c5Ss2XCTLdyEr0YconosP4EmQufU2MVshGYR
+i3drVByjtdgQ8K4p92cIiBdcuJd5z+orKu5YM+Vt6SmqZQENghPsJQtdLEByFSnT
+kCz3GkPVavBpAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU
+8snBDw1jALvsRQ5KH7WxszbNDo0wHQYDVR0OBBYEFPLJwQ8NYwC77EUOSh+1sbM2
+zQ6NMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEANGd5sjrG5T33
+I3K5Ce+SrScfoE4KsvXaFwyihdJ+klH9FWXXXGtkFu6KRcoMQzZENdl//nk6HOjG
+5D1rd9QhEOP28yBOqb6J8xycqd+8MDoX0TJD0KqKchxRKEzdNsjkLWd9kYccnbz8
+qyiWXmFcuCIzGEgWUOrKL+mlSdx/PKQZvDatkuK59EvV6wit53j+F8Bdh3foZ3dP
+AGav9LEDOr4SfEE15fSmG0eLy3n31r8Xbk5l8PjaV8GUgeV6Vg27Rn9vkf195hfk
+gSe7BYhW3SCl95gtkRlpMV+bMPKZrXJAlszYd2abtNUOshD+FKrDgHGdPY3ofRRs
+YWSGRqbXVMW215AWRqWFyp464+YTFrYVI8ypKVL9AMb2kI5Wj4kI3Zaq5tNqqYY1
+9tVFeEJKRvwDyF7YZvZFZSS0vod7VSCd9521Kvy5YhnLbDuv0204bKt7ph6N/Ome
+/msVuduCmsuY33OhkKCgxeDoAaijFJzIwZqsFVAzje18KotzlUBDJvyBpCpfOZC3
+J8tRd/iWkx7P8nd9H0aTolkelUTFLXVksNb54Dxp6gS1HAviRkRNQzuXSXERvSS2
+wq1yVAb+axj5d9spLFKebXd7Yv0PTY6YMjAwcRLWJTXjn/hvnLXrahut6hDTlhZy
+BiElxky8j3C7DOReIoMt0r7+hVu05L0=
+-----END CERTIFICATE-----
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/certifi/core.py b/addons/source-python/packages/site-packages/pip/_vendor/certifi/core.py
index 70e0c3bdb..2f2f7e088 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/certifi/core.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/certifi/core.py
@@ -46,7 +46,7 @@ def where() -> str:
def contents() -> str:
return files("pip._vendor.certifi").joinpath("cacert.pem").read_text(encoding="ascii")
-elif sys.version_info >= (3, 7):
+else:
from importlib.resources import path as get_path, read_text
@@ -81,34 +81,3 @@ def where() -> str:
def contents() -> str:
return read_text("pip._vendor.certifi", "cacert.pem", encoding="ascii")
-
-else:
- import os
- import types
- from typing import Union
-
- Package = Union[types.ModuleType, str]
- Resource = Union[str, "os.PathLike"]
-
- # This fallback will work for Python versions prior to 3.7 that lack the
- # importlib.resources module but relies on the existing `where` function
- # so won't address issues with environments like PyOxidizer that don't set
- # __file__ on modules.
- def read_text(
- package: Package,
- resource: Resource,
- encoding: str = 'utf-8',
- errors: str = 'strict'
- ) -> str:
- with open(where(), encoding=encoding) as data:
- return data.read()
-
- # If we don't have importlib.resources, then we will just do the old logic
- # of assuming we're on the filesystem and munge the path directly.
- def where() -> str:
- f = os.path.dirname(__file__)
-
- return os.path.join(f, "cacert.pem")
-
- def contents() -> str:
- return read_text("pip._vendor.certifi", "cacert.pem", encoding="ascii")
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/LICENSE.txt b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/LICENSE.txt
new file mode 100644
index 000000000..b9723b85e
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/__init__.py
new file mode 100644
index 000000000..9fec20299
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/__main__.py b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/__main__.py
new file mode 100644
index 000000000..48ebb0d41
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_implementation.py b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_implementation.py
new file mode 100644
index 000000000..64e314a63
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_implementation.py
@@ -0,0 +1,209 @@
+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):
+ include_group = _normalize_name(item.include_group)
+ if include_group in self._include_graph_ancestors.get(group, ()):
+ raise CyclicDependencyError(
+ requested_group, group, item.include_group
+ )
+ self._include_graph_ancestors[include_group] = (
+ *self._include_graph_ancestors.get(group, ()),
+ group,
+ )
+ resolved_group.extend(self._resolve(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
+ """
+ resolver = DependencyGroupResolver(dependency_groups)
+ return tuple(str(r) for group in groups for r in resolver.resolve(group))
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_lint_dependency_groups.py b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_lint_dependency_groups.py
new file mode 100644
index 000000000..09454bdc2
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_pip_wrapper.py b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_pip_wrapper.py
new file mode 100644
index 000000000..f86d8961b
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_toml_compat.py b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/_toml_compat.py
new file mode 100644
index 000000000..8d6f921c2
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/py.typed b/addons/source-python/packages/site-packages/pip/_vendor/dependency_groups/py.typed
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/distlib/LICENSE.txt b/addons/source-python/packages/site-packages/pip/_vendor/distlib/LICENSE.txt
new file mode 100644
index 000000000..c31ac56d7
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/distlib/LICENSE.txt
@@ -0,0 +1,284 @@
+A. HISTORY OF THE SOFTWARE
+==========================
+
+Python was created in the early 1990s by Guido van Rossum at Stichting
+Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
+as a successor of a language called ABC. Guido remains Python's
+principal author, although it includes many contributions from others.
+
+In 1995, Guido continued his work on Python at the Corporation for
+National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
+in Reston, Virginia where he released several versions of the
+software.
+
+In May 2000, Guido and the Python core development team moved to
+BeOpen.com to form the BeOpen PythonLabs team. In October of the same
+year, the PythonLabs team moved to Digital Creations (now Zope
+Corporation, see http://www.zope.com). In 2001, the Python Software
+Foundation (PSF, see http://www.python.org/psf/) was formed, a
+non-profit organization created specifically to own Python-related
+Intellectual Property. Zope Corporation is a sponsoring member of
+the PSF.
+
+All Python releases are Open Source (see http://www.opensource.org for
+the Open Source Definition). Historically, most, but not all, Python
+releases have also been GPL-compatible; the table below summarizes
+the various releases.
+
+ Release Derived Year Owner GPL-
+ from compatible? (1)
+
+ 0.9.0 thru 1.2 1991-1995 CWI yes
+ 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
+ 1.6 1.5.2 2000 CNRI no
+ 2.0 1.6 2000 BeOpen.com no
+ 1.6.1 1.6 2001 CNRI yes (2)
+ 2.1 2.0+1.6.1 2001 PSF no
+ 2.0.1 2.0+1.6.1 2001 PSF yes
+ 2.1.1 2.1+2.0.1 2001 PSF yes
+ 2.2 2.1.1 2001 PSF yes
+ 2.1.2 2.1.1 2002 PSF yes
+ 2.1.3 2.1.2 2002 PSF yes
+ 2.2.1 2.2 2002 PSF yes
+ 2.2.2 2.2.1 2002 PSF yes
+ 2.2.3 2.2.2 2003 PSF yes
+ 2.3 2.2.2 2002-2003 PSF yes
+ 2.3.1 2.3 2002-2003 PSF yes
+ 2.3.2 2.3.1 2002-2003 PSF yes
+ 2.3.3 2.3.2 2002-2003 PSF yes
+ 2.3.4 2.3.3 2004 PSF yes
+ 2.3.5 2.3.4 2005 PSF yes
+ 2.4 2.3 2004 PSF yes
+ 2.4.1 2.4 2005 PSF yes
+ 2.4.2 2.4.1 2005 PSF yes
+ 2.4.3 2.4.2 2006 PSF yes
+ 2.4.4 2.4.3 2006 PSF yes
+ 2.5 2.4 2006 PSF yes
+ 2.5.1 2.5 2007 PSF yes
+ 2.5.2 2.5.1 2008 PSF yes
+ 2.5.3 2.5.2 2008 PSF yes
+ 2.6 2.5 2008 PSF yes
+ 2.6.1 2.6 2008 PSF yes
+ 2.6.2 2.6.1 2009 PSF yes
+ 2.6.3 2.6.2 2009 PSF yes
+ 2.6.4 2.6.3 2009 PSF yes
+ 2.6.5 2.6.4 2010 PSF yes
+ 3.0 2.6 2008 PSF yes
+ 3.0.1 3.0 2009 PSF yes
+ 3.1 3.0.1 2009 PSF yes
+ 3.1.1 3.1 2009 PSF yes
+ 3.1.2 3.1 2010 PSF yes
+ 3.2 3.1 2010 PSF yes
+
+Footnotes:
+
+(1) GPL-compatible doesn't mean that we're distributing Python under
+ the GPL. All Python licenses, unlike the GPL, let you distribute
+ a modified version without making your changes open source. The
+ GPL-compatible licenses make it possible to combine Python with
+ other software that is released under the GPL; the others don't.
+
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
+ because its license has a choice of law clause. According to
+ CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
+ is "not incompatible" with the GPL.
+
+Thanks to the many outside volunteers who have worked under Guido's
+direction to make these releases possible.
+
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python alone or
+in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee. This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions. Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee. This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party. As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee. Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement. This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013. This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee. This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+ ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/distlib/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/distlib/__init__.py
index bf0d6c6d3..4e82943ef 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/distlib/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/distlib/__init__.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2012-2023 Vinay Sajip.
+# Copyright (C) 2012-2024 Vinay Sajip.
# Licensed to the Python Software Foundation under a contributor agreement.
# See LICENSE.txt and CONTRIBUTORS.txt.
#
import logging
-__version__ = '0.3.9'
+__version__ = '0.4.0'
class DistlibException(Exception):
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/distlib/scripts.py b/addons/source-python/packages/site-packages/pip/_vendor/distlib/scripts.py
index b1fc705b7..195dc3f89 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/distlib/scripts.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/distlib/scripts.py
@@ -42,8 +42,8 @@
SCRIPT_TEMPLATE = r'''# -*- coding: utf-8 -*-
import re
import sys
-from %(module)s import %(import_name)s
if __name__ == '__main__':
+ from %(module)s import %(import_name)s
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
sys.exit(%(func)s())
'''
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/distro/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/distro/LICENSE
new file mode 100644
index 000000000..e06d20818
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/distro/LICENSE
@@ -0,0 +1,202 @@
+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.
+
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/idna/LICENSE.md b/addons/source-python/packages/site-packages/pip/_vendor/idna/LICENSE.md
new file mode 100644
index 000000000..256ba90cd
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/idna/LICENSE.md
@@ -0,0 +1,31 @@
+BSD 3-Clause License
+
+Copyright (c) 2013-2025, 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:
+
+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.
+
+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.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/idna/codec.py b/addons/source-python/packages/site-packages/pip/_vendor/idna/codec.py
index 913abfd6a..cbc2e4ff4 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/idna/codec.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/idna/codec.py
@@ -111,7 +111,7 @@ def search_function(name: str) -> Optional[codecs.CodecInfo]:
return codecs.CodecInfo(
name=name,
encode=Codec().encode,
- decode=Codec().decode,
+ decode=Codec().decode, # type: ignore
incrementalencoder=IncrementalEncoder,
incrementaldecoder=IncrementalDecoder,
streamwriter=StreamWriter,
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/idna/core.py b/addons/source-python/packages/site-packages/pip/_vendor/idna/core.py
index 9115f123f..8177bf7a3 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/idna/core.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/idna/core.py
@@ -308,7 +308,7 @@ def ulabel(label: Union[str, bytes, bytearray]) -> str:
check_label(label)
return label
else:
- label_bytes = label
+ label_bytes = bytes(label)
label_bytes = label_bytes.lower()
if label_bytes.startswith(_alabel_prefix):
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/idna/idnadata.py b/addons/source-python/packages/site-packages/pip/_vendor/idna/idnadata.py
index 4be600462..ded47cae0 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/idna/idnadata.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/idna/idnadata.py
@@ -1,6 +1,7 @@
# This file is automatically generated by tools/idna-data
-__version__ = "15.1.0"
+__version__ = "16.0.0"
+
scripts = {
"Greek": (
0x37000000374,
@@ -727,6 +728,7 @@
0x88C: 68,
0x88D: 68,
0x88E: 82,
+ 0x897: 84,
0x898: 84,
0x899: 84,
0x89A: 84,
@@ -1873,8 +1875,17 @@
0x10D25: 84,
0x10D26: 84,
0x10D27: 84,
+ 0x10D69: 84,
+ 0x10D6A: 84,
+ 0x10D6B: 84,
+ 0x10D6C: 84,
+ 0x10D6D: 84,
0x10EAB: 84,
0x10EAC: 84,
+ 0x10EC2: 82,
+ 0x10EC3: 68,
+ 0x10EC4: 68,
+ 0x10EFC: 84,
0x10EFD: 84,
0x10EFE: 84,
0x10EFF: 84,
@@ -2053,6 +2064,17 @@
0x11372: 84,
0x11373: 84,
0x11374: 84,
+ 0x113BB: 84,
+ 0x113BC: 84,
+ 0x113BD: 84,
+ 0x113BE: 84,
+ 0x113BF: 84,
+ 0x113C0: 84,
+ 0x113CE: 84,
+ 0x113D0: 84,
+ 0x113D2: 84,
+ 0x113E1: 84,
+ 0x113E2: 84,
0x11438: 84,
0x11439: 84,
0x1143A: 84,
@@ -2108,7 +2130,6 @@
0x116B5: 84,
0x116B7: 84,
0x1171D: 84,
- 0x1171E: 84,
0x1171F: 84,
0x11722: 84,
0x11723: 84,
@@ -2265,6 +2286,7 @@
0x11F3A: 84,
0x11F40: 84,
0x11F42: 84,
+ 0x11F5A: 84,
0x13430: 84,
0x13431: 84,
0x13432: 84,
@@ -2297,6 +2319,21 @@
0x13453: 84,
0x13454: 84,
0x13455: 84,
+ 0x1611E: 84,
+ 0x1611F: 84,
+ 0x16120: 84,
+ 0x16121: 84,
+ 0x16122: 84,
+ 0x16123: 84,
+ 0x16124: 84,
+ 0x16125: 84,
+ 0x16126: 84,
+ 0x16127: 84,
+ 0x16128: 84,
+ 0x16129: 84,
+ 0x1612D: 84,
+ 0x1612E: 84,
+ 0x1612F: 84,
0x16AF0: 84,
0x16AF1: 84,
0x16AF2: 84,
@@ -2605,6 +2642,8 @@
0x1E4ED: 84,
0x1E4EE: 84,
0x1E4EF: 84,
+ 0x1E5EE: 84,
+ 0x1E5EF: 84,
0x1E8D0: 84,
0x1E8D1: 84,
0x1E8D2: 84,
@@ -3328,7 +3367,7 @@
0x8600000086B,
0x87000000888,
0x8890000088F,
- 0x898000008E2,
+ 0x897000008E2,
0x8E300000958,
0x96000000964,
0x96600000970,
@@ -3563,6 +3602,7 @@
0x1C0000001C38,
0x1C4000001C4A,
0x1C4D00001C7E,
+ 0x1C8A00001C8B,
0x1CD000001CD3,
0x1CD400001CFB,
0x1D0000001D2C,
@@ -3926,11 +3966,13 @@
0xA7C30000A7C4,
0xA7C80000A7C9,
0xA7CA0000A7CB,
+ 0xA7CD0000A7CE,
0xA7D10000A7D2,
0xA7D30000A7D4,
0xA7D50000A7D6,
0xA7D70000A7D8,
0xA7D90000A7DA,
+ 0xA7DB0000A7DC,
0xA7F60000A7F8,
0xA7FA0000A828,
0xA82C0000A82D,
@@ -4000,6 +4042,7 @@
0x105A3000105B2,
0x105B3000105BA,
0x105BB000105BD,
+ 0x105C0000105F4,
0x1060000010737,
0x1074000010756,
0x1076000010768,
@@ -4037,10 +4080,14 @@
0x10CC000010CF3,
0x10D0000010D28,
0x10D3000010D3A,
+ 0x10D4000010D50,
+ 0x10D6900010D6E,
+ 0x10D6F00010D86,
0x10E8000010EAA,
0x10EAB00010EAD,
0x10EB000010EB2,
- 0x10EFD00010F1D,
+ 0x10EC200010EC5,
+ 0x10EFC00010F1D,
0x10F2700010F28,
0x10F3000010F51,
0x10F7000010F86,
@@ -4086,6 +4133,16 @@
0x1135D00011364,
0x113660001136D,
0x1137000011375,
+ 0x113800001138A,
+ 0x1138B0001138C,
+ 0x1138E0001138F,
+ 0x11390000113B6,
+ 0x113B7000113C1,
+ 0x113C2000113C3,
+ 0x113C5000113C6,
+ 0x113C7000113CB,
+ 0x113CC000113D4,
+ 0x113E1000113E3,
0x114000001144B,
0x114500001145A,
0x1145E00011462,
@@ -4100,6 +4157,7 @@
0x116500001165A,
0x11680000116B9,
0x116C0000116CA,
+ 0x116D0000116E4,
0x117000001171B,
0x1171D0001172C,
0x117300001173A,
@@ -4123,6 +4181,8 @@
0x11A5000011A9A,
0x11A9D00011A9E,
0x11AB000011AF9,
+ 0x11BC000011BE1,
+ 0x11BF000011BFA,
0x11C0000011C09,
0x11C0A00011C37,
0x11C3800011C41,
@@ -4147,14 +4207,16 @@
0x11F0000011F11,
0x11F1200011F3B,
0x11F3E00011F43,
- 0x11F5000011F5A,
+ 0x11F5000011F5B,
0x11FB000011FB1,
0x120000001239A,
0x1248000012544,
0x12F9000012FF1,
0x1300000013430,
0x1344000013456,
+ 0x13460000143FB,
0x1440000014647,
+ 0x161000001613A,
0x1680000016A39,
0x16A4000016A5F,
0x16A6000016A6A,
@@ -4167,6 +4229,8 @@
0x16B5000016B5A,
0x16B6300016B78,
0x16B7D00016B90,
+ 0x16D4000016D6D,
+ 0x16D7000016D7A,
0x16E6000016E80,
0x16F0000016F4B,
0x16F4F00016F88,
@@ -4176,7 +4240,7 @@
0x16FF000016FF2,
0x17000000187F8,
0x1880000018CD6,
- 0x18D0000018D09,
+ 0x18CFF00018D09,
0x1AFF00001AFF4,
0x1AFF50001AFFC,
0x1AFFD0001AFFF,
@@ -4191,6 +4255,7 @@
0x1BC800001BC89,
0x1BC900001BC9A,
0x1BC9D0001BC9F,
+ 0x1CCF00001CCFA,
0x1CF000001CF2E,
0x1CF300001CF47,
0x1DA000001DA37,
@@ -4214,6 +4279,7 @@
0x1E2900001E2AF,
0x1E2C00001E2FA,
0x1E4D00001E4FA,
+ 0x1E5D00001E5FB,
0x1E7E00001E7E7,
0x1E7E80001E7EC,
0x1E7ED0001E7EF,
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/idna/package_data.py b/addons/source-python/packages/site-packages/pip/_vendor/idna/package_data.py
index 514ff7e2e..7272c8d92 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/idna/package_data.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/idna/package_data.py
@@ -1 +1 @@
-__version__ = "3.10"
+__version__ = "3.11"
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/idna/uts46data.py b/addons/source-python/packages/site-packages/pip/_vendor/idna/uts46data.py
index eb8943274..4610b71da 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/idna/uts46data.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/idna/uts46data.py
@@ -6,59 +6,59 @@
"""IDNA Mapping Table from UTS46."""
-__version__ = "15.1.0"
+__version__ = "16.0.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"),
+ (0x0, "V"),
+ (0x1, "V"),
+ (0x2, "V"),
+ (0x3, "V"),
+ (0x4, "V"),
+ (0x5, "V"),
+ (0x6, "V"),
+ (0x7, "V"),
+ (0x8, "V"),
+ (0x9, "V"),
+ (0xA, "V"),
+ (0xB, "V"),
+ (0xC, "V"),
+ (0xD, "V"),
+ (0xE, "V"),
+ (0xF, "V"),
+ (0x10, "V"),
+ (0x11, "V"),
+ (0x12, "V"),
+ (0x13, "V"),
+ (0x14, "V"),
+ (0x15, "V"),
+ (0x16, "V"),
+ (0x17, "V"),
+ (0x18, "V"),
+ (0x19, "V"),
+ (0x1A, "V"),
+ (0x1B, "V"),
+ (0x1C, "V"),
+ (0x1D, "V"),
+ (0x1E, "V"),
+ (0x1F, "V"),
+ (0x20, "V"),
+ (0x21, "V"),
+ (0x22, "V"),
+ (0x23, "V"),
+ (0x24, "V"),
+ (0x25, "V"),
+ (0x26, "V"),
+ (0x27, "V"),
+ (0x28, "V"),
+ (0x29, "V"),
+ (0x2A, "V"),
+ (0x2B, "V"),
+ (0x2C, "V"),
(0x2D, "V"),
(0x2E, "V"),
- (0x2F, "3"),
+ (0x2F, "V"),
(0x30, "V"),
(0x31, "V"),
(0x32, "V"),
@@ -69,13 +69,13 @@ def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x37, "V"),
(0x38, "V"),
(0x39, "V"),
- (0x3A, "3"),
- (0x3B, "3"),
- (0x3C, "3"),
- (0x3D, "3"),
- (0x3E, "3"),
- (0x3F, "3"),
- (0x40, "3"),
+ (0x3A, "V"),
+ (0x3B, "V"),
+ (0x3C, "V"),
+ (0x3D, "V"),
+ (0x3E, "V"),
+ (0x3F, "V"),
+ (0x40, "V"),
(0x41, "M", "a"),
(0x42, "M", "b"),
(0x43, "M", "c"),
@@ -102,12 +102,12 @@ def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x58, "M", "x"),
(0x59, "M", "y"),
(0x5A, "M", "z"),
- (0x5B, "3"),
- (0x5C, "3"),
- (0x5D, "3"),
- (0x5E, "3"),
- (0x5F, "3"),
- (0x60, "3"),
+ (0x5B, "V"),
+ (0x5C, "V"),
+ (0x5D, "V"),
+ (0x5E, "V"),
+ (0x5F, "V"),
+ (0x60, "V"),
(0x61, "V"),
(0x62, "V"),
(0x63, "V"),
@@ -139,11 +139,11 @@ def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x78, "V"),
(0x79, "V"),
(0x7A, "V"),
- (0x7B, "3"),
- (0x7C, "3"),
- (0x7D, "3"),
- (0x7E, "3"),
- (0x7F, "3"),
+ (0x7B, "V"),
+ (0x7C, "V"),
+ (0x7D, "V"),
+ (0x7E, "V"),
+ (0x7F, "V"),
(0x80, "X"),
(0x81, "X"),
(0x82, "X"),
@@ -176,7 +176,7 @@ def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x9D, "X"),
(0x9E, "X"),
(0x9F, "X"),
- (0xA0, "3", " "),
+ (0xA0, "M", " "),
(0xA1, "V"),
(0xA2, "V"),
(0xA3, "V"),
@@ -184,23 +184,23 @@ def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xA5, "V"),
(0xA6, "V"),
(0xA7, "V"),
- (0xA8, "3", " ̈"),
+ (0xA8, "M", " ̈"),
(0xA9, "V"),
(0xAA, "M", "a"),
(0xAB, "V"),
(0xAC, "V"),
(0xAD, "I"),
(0xAE, "V"),
- (0xAF, "3", " ̄"),
+ (0xAF, "M", " ̄"),
(0xB0, "V"),
(0xB1, "V"),
(0xB2, "M", "2"),
(0xB3, "M", "3"),
- (0xB4, "3", " ́"),
+ (0xB4, "M", " ́"),
(0xB5, "M", "μ"),
(0xB6, "V"),
(0xB7, "V"),
- (0xB8, "3", " ̧"),
+ (0xB8, "M", " ̧"),
(0xB9, "M", "1"),
(0xBA, "M", "o"),
(0xBB, "V"),
@@ -606,12 +606,12 @@ def _seg_5() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2B7, "M", "w"),
(0x2B8, "M", "y"),
(0x2B9, "V"),
- (0x2D8, "3", " ̆"),
- (0x2D9, "3", " ̇"),
- (0x2DA, "3", " ̊"),
- (0x2DB, "3", " ̨"),
- (0x2DC, "3", " ̃"),
- (0x2DD, "3", " ̋"),
+ (0x2D8, "M", " ̆"),
+ (0x2D9, "M", " ̇"),
+ (0x2DA, "M", " ̊"),
+ (0x2DB, "M", " ̨"),
+ (0x2DC, "M", " ̃"),
+ (0x2DD, "M", " ̋"),
(0x2DE, "V"),
(0x2E0, "M", "ɣ"),
(0x2E1, "M", "l"),
@@ -642,13 +642,13 @@ def _seg_5() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
def _seg_6() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
return [
(0x378, "X"),
- (0x37A, "3", " ι"),
+ (0x37A, "M", " ι"),
(0x37B, "V"),
- (0x37E, "3", ";"),
+ (0x37E, "M", ";"),
(0x37F, "M", "ϳ"),
(0x380, "X"),
- (0x384, "3", " ́"),
- (0x385, "3", " ̈́"),
+ (0x384, "M", " ́"),
+ (0x385, "M", " ̈́"),
(0x386, "M", "ά"),
(0x387, "M", "·"),
(0x388, "M", "έ"),
@@ -885,7 +885,7 @@ def _seg_8() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x4BD, "V"),
(0x4BE, "M", "ҿ"),
(0x4BF, "V"),
- (0x4C0, "X"),
+ (0x4C0, "M", "ӏ"),
(0x4C1, "M", "ӂ"),
(0x4C2, "V"),
(0x4C3, "M", "ӄ"),
@@ -1087,7 +1087,7 @@ def _seg_10() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x86B, "X"),
(0x870, "V"),
(0x88F, "X"),
- (0x898, "V"),
+ (0x897, "V"),
(0x8E2, "X"),
(0x8E3, "V"),
(0x958, "M", "क़"),
@@ -1438,7 +1438,50 @@ def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFCE, "V"),
(0xFDB, "X"),
(0x1000, "V"),
- (0x10A0, "X"),
+ (0x10A0, "M", "ⴀ"),
+ (0x10A1, "M", "ⴁ"),
+ (0x10A2, "M", "ⴂ"),
+ (0x10A3, "M", "ⴃ"),
+ (0x10A4, "M", "ⴄ"),
+ (0x10A5, "M", "ⴅ"),
+ (0x10A6, "M", "ⴆ"),
+ (0x10A7, "M", "ⴇ"),
+ (0x10A8, "M", "ⴈ"),
+ (0x10A9, "M", "ⴉ"),
+ (0x10AA, "M", "ⴊ"),
+ (0x10AB, "M", "ⴋ"),
+ (0x10AC, "M", "ⴌ"),
+ (0x10AD, "M", "ⴍ"),
+ (0x10AE, "M", "ⴎ"),
+ (0x10AF, "M", "ⴏ"),
+ (0x10B0, "M", "ⴐ"),
+ (0x10B1, "M", "ⴑ"),
+ (0x10B2, "M", "ⴒ"),
+ (0x10B3, "M", "ⴓ"),
+ (0x10B4, "M", "ⴔ"),
+ (0x10B5, "M", "ⴕ"),
+ (0x10B6, "M", "ⴖ"),
+ (0x10B7, "M", "ⴗ"),
+ (0x10B8, "M", "ⴘ"),
+ (0x10B9, "M", "ⴙ"),
+ (0x10BA, "M", "ⴚ"),
+ (0x10BB, "M", "ⴛ"),
+ (0x10BC, "M", "ⴜ"),
+ (0x10BD, "M", "ⴝ"),
+ (0x10BE, "M", "ⴞ"),
+ (0x10BF, "M", "ⴟ"),
+ (0x10C0, "M", "ⴠ"),
+ (0x10C1, "M", "ⴡ"),
+ (0x10C2, "M", "ⴢ"),
+ (0x10C3, "M", "ⴣ"),
+ (0x10C4, "M", "ⴤ"),
+ (0x10C5, "M", "ⴥ"),
+ ]
+
+
+def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
+ (0x10C6, "X"),
(0x10C7, "M", "ⴧ"),
(0x10C8, "X"),
(0x10CD, "M", "ⴭ"),
@@ -1446,7 +1489,7 @@ def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x10D0, "V"),
(0x10FC, "M", "ნ"),
(0x10FD, "V"),
- (0x115F, "X"),
+ (0x115F, "I"),
(0x1161, "V"),
(0x1249, "X"),
(0x124A, "V"),
@@ -1476,11 +1519,6 @@ def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -1516,7 +1554,7 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1772, "V"),
(0x1774, "X"),
(0x1780, "V"),
- (0x17B4, "X"),
+ (0x17B4, "I"),
(0x17B6, "V"),
(0x17DE, "X"),
(0x17E0, "V"),
@@ -1524,11 +1562,7 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x17F0, "V"),
(0x17FA, "X"),
(0x1800, "V"),
- (0x1806, "X"),
- (0x1807, "V"),
(0x180B, "I"),
- (0x180E, "X"),
- (0x180F, "I"),
(0x1810, "V"),
(0x181A, "X"),
(0x1820, "V"),
@@ -1547,6 +1581,11 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1941, "X"),
(0x1944, "V"),
(0x196E, "X"),
+ ]
+
+
+def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1970, "V"),
(0x1975, "X"),
(0x1980, "V"),
@@ -1571,9 +1610,7 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1ACF, "X"),
(0x1B00, "V"),
(0x1B4D, "X"),
- (0x1B50, "V"),
- (0x1B7F, "X"),
- (0x1B80, "V"),
+ (0x1B4E, "V"),
(0x1BF4, "X"),
(0x1BFC, "V"),
(0x1C38, "X"),
@@ -1581,11 +1618,6 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "с"),
@@ -1593,7 +1625,9 @@ def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1C86, "M", "ъ"),
(0x1C87, "M", "ѣ"),
(0x1C88, "M", "ꙋ"),
- (0x1C89, "X"),
+ (0x1C89, "M", ""),
+ (0x1C8A, "V"),
+ (0x1C8B, "X"),
(0x1C90, "M", "ა"),
(0x1C91, "M", "ბ"),
(0x1C92, "M", "გ"),
@@ -1652,6 +1686,11 @@ def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D2F, "V"),
(0x1D30, "M", "d"),
(0x1D31, "M", "e"),
+ ]
+
+
+def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D32, "M", "ǝ"),
(0x1D33, "M", "g"),
(0x1D34, "M", "h"),
@@ -1686,11 +1725,6 @@ def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -1757,6 +1791,11 @@ def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1DC0, "V"),
(0x1E00, "M", "ḁ"),
(0x1E01, "V"),
+ ]
+
+
+def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1E02, "M", "ḃ"),
(0x1E03, "V"),
(0x1E04, "M", "ḅ"),
@@ -1791,11 +1830,6 @@ def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ḧ"),
@@ -1862,6 +1896,11 @@ def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1E63, "V"),
(0x1E64, "M", "ṥ"),
(0x1E65, "V"),
+ ]
+
+
+def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1E66, "M", "ṧ"),
(0x1E67, "V"),
(0x1E68, "M", "ṩ"),
@@ -1896,11 +1935,6 @@ def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ẋ"),
@@ -1967,6 +2001,11 @@ def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1ECC, "M", "ọ"),
(0x1ECD, "V"),
(0x1ECE, "M", "ỏ"),
+ ]
+
+
+def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1ECF, "V"),
(0x1ED0, "M", "ố"),
(0x1ED1, "V"),
@@ -2001,11 +2040,6 @@ def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -2072,6 +2106,11 @@ def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1F5B, "M", "ὓ"),
(0x1F5C, "X"),
(0x1F5D, "M", "ὕ"),
+ ]
+
+
+def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1F5E, "X"),
(0x1F5F, "M", "ὗ"),
(0x1F60, "V"),
@@ -2106,11 +2145,6 @@ def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ἂι"),
@@ -2163,11 +2197,11 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1FBA, "M", "ὰ"),
(0x1FBB, "M", "ά"),
(0x1FBC, "M", "αι"),
- (0x1FBD, "3", " ̓"),
+ (0x1FBD, "M", " ̓"),
(0x1FBE, "M", "ι"),
- (0x1FBF, "3", " ̓"),
- (0x1FC0, "3", " ͂"),
- (0x1FC1, "3", " ̈͂"),
+ (0x1FBF, "M", " ̓"),
+ (0x1FC0, "M", " ͂"),
+ (0x1FC1, "M", " ̈͂"),
(0x1FC2, "M", "ὴι"),
(0x1FC3, "M", "ηι"),
(0x1FC4, "M", "ήι"),
@@ -2177,11 +2211,16 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1FC8, "M", "ὲ"),
(0x1FC9, "M", "έ"),
(0x1FCA, "M", "ὴ"),
+ ]
+
+
+def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1FCB, "M", "ή"),
(0x1FCC, "M", "ηι"),
- (0x1FCD, "3", " ̓̀"),
- (0x1FCE, "3", " ̓́"),
- (0x1FCF, "3", " ̓͂"),
+ (0x1FCD, "M", " ̓̀"),
+ (0x1FCE, "M", " ̓́"),
+ (0x1FCF, "M", " ̓͂"),
(0x1FD0, "V"),
(0x1FD3, "M", "ΐ"),
(0x1FD4, "X"),
@@ -2191,9 +2230,9 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1FDA, "M", "ὶ"),
(0x1FDB, "M", "ί"),
(0x1FDC, "X"),
- (0x1FDD, "3", " ̔̀"),
- (0x1FDE, "3", " ̔́"),
- (0x1FDF, "3", " ̔͂"),
+ (0x1FDD, "M", " ̔̀"),
+ (0x1FDE, "M", " ̔́"),
+ (0x1FDF, "M", " ̔͂"),
(0x1FE0, "V"),
(0x1FE3, "M", "ΰ"),
(0x1FE4, "V"),
@@ -2202,42 +2241,37 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1FEA, "M", "ὺ"),
(0x1FEB, "M", "ύ"),
(0x1FEC, "M", "ῥ"),
- (0x1FED, "3", " ̈̀"),
- (0x1FEE, "3", " ̈́"),
- (0x1FEF, "3", "`"),
+ (0x1FED, "M", " ̈̀"),
+ (0x1FEE, "M", " ̈́"),
+ (0x1FEF, "M", "`"),
(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", " ̔"),
+ (0x1FFD, "M", " ́"),
+ (0x1FFE, "M", " ̔"),
(0x1FFF, "X"),
- (0x2000, "3", " "),
+ (0x2000, "M", " "),
(0x200B, "I"),
(0x200C, "D", ""),
(0x200E, "X"),
(0x2010, "V"),
(0x2011, "M", "‐"),
(0x2012, "V"),
- (0x2017, "3", " ̳"),
+ (0x2017, "M", " ̳"),
(0x2018, "V"),
(0x2024, "X"),
(0x2027, "V"),
(0x2028, "X"),
- (0x202F, "3", " "),
+ (0x202F, "M", " "),
(0x2030, "V"),
(0x2033, "M", "′′"),
(0x2034, "M", "′′′"),
@@ -2245,21 +2279,20 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2036, "M", "‵‵"),
(0x2037, "M", "‵‵‵"),
(0x2038, "V"),
- (0x203C, "3", "!!"),
+ (0x203C, "M", "!!"),
(0x203D, "V"),
- (0x203E, "3", " ̅"),
+ (0x203E, "M", " ̅"),
(0x203F, "V"),
- (0x2047, "3", "??"),
- (0x2048, "3", "?!"),
- (0x2049, "3", "!?"),
+ (0x2047, "M", "??"),
+ (0x2048, "M", "?!"),
+ (0x2049, "M", "!?"),
(0x204A, "V"),
(0x2057, "M", "′′′′"),
(0x2058, "V"),
- (0x205F, "3", " "),
+ (0x205F, "M", " "),
(0x2060, "I"),
- (0x2061, "X"),
- (0x2064, "I"),
(0x2065, "X"),
+ (0x206A, "I"),
(0x2070, "M", "0"),
(0x2071, "M", "i"),
(0x2072, "X"),
@@ -2269,11 +2302,11 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2077, "M", "7"),
(0x2078, "M", "8"),
(0x2079, "M", "9"),
- (0x207A, "3", "+"),
+ (0x207A, "M", "+"),
(0x207B, "M", "−"),
- (0x207C, "3", "="),
- (0x207D, "3", "("),
- (0x207E, "3", ")"),
+ (0x207C, "M", "="),
+ (0x207D, "M", "("),
+ (0x207E, "M", ")"),
(0x207F, "M", "n"),
(0x2080, "M", "0"),
(0x2081, "M", "1"),
@@ -2283,13 +2316,18 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2085, "M", "5"),
(0x2086, "M", "6"),
(0x2087, "M", "7"),
+ ]
+
+
+def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2088, "M", "8"),
(0x2089, "M", "9"),
- (0x208A, "3", "+"),
+ (0x208A, "M", "+"),
(0x208B, "M", "−"),
- (0x208C, "3", "="),
- (0x208D, "3", "("),
- (0x208E, "3", ")"),
+ (0x208C, "M", "="),
+ (0x208D, "M", "("),
+ (0x208E, "M", ")"),
(0x208F, "X"),
(0x2090, "M", "a"),
(0x2091, "M", "e"),
@@ -2311,18 +2349,13 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x20C1, "X"),
(0x20D0, "V"),
(0x20F1, "X"),
- (0x2100, "3", "a/c"),
- (0x2101, "3", "a/s"),
+ (0x2100, "M", "a/c"),
+ (0x2101, "M", "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"),
+ (0x2105, "M", "c/o"),
+ (0x2106, "M", "c/u"),
(0x2107, "M", "ɛ"),
(0x2108, "V"),
(0x2109, "M", "°f"),
@@ -2356,7 +2389,7 @@ def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x212E, "V"),
(0x212F, "M", "e"),
(0x2131, "M", "f"),
- (0x2132, "X"),
+ (0x2132, "M", "ⅎ"),
(0x2133, "M", "m"),
(0x2134, "M", "o"),
(0x2135, "M", "א"),
@@ -2388,6 +2421,11 @@ def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2159, "M", "1⁄6"),
(0x215A, "M", "5⁄6"),
(0x215B, "M", "1⁄8"),
+ ]
+
+
+def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x215C, "M", "3⁄8"),
(0x215D, "M", "5⁄8"),
(0x215E, "M", "7⁄8"),
@@ -2421,16 +2459,11 @@ def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
+ (0x2183, "M", "ↄ"),
(0x2184, "V"),
(0x2189, "M", "0⁄3"),
(0x218A, "V"),
@@ -2445,7 +2478,7 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2329, "M", "〈"),
(0x232A, "M", "〉"),
(0x232B, "V"),
- (0x2427, "X"),
+ (0x242A, "X"),
(0x2440, "V"),
(0x244B, "X"),
(0x2460, "M", "1"),
@@ -2468,53 +2501,58 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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)"),
+ (0x2474, "M", "(1)"),
+ (0x2475, "M", "(2)"),
+ (0x2476, "M", "(3)"),
+ (0x2477, "M", "(4)"),
+ (0x2478, "M", "(5)"),
+ (0x2479, "M", "(6)"),
+ (0x247A, "M", "(7)"),
+ (0x247B, "M", "(8)"),
+ (0x247C, "M", "(9)"),
+ (0x247D, "M", "(10)"),
+ (0x247E, "M", "(11)"),
+ (0x247F, "M", "(12)"),
+ (0x2480, "M", "(13)"),
+ (0x2481, "M", "(14)"),
+ (0x2482, "M", "(15)"),
+ (0x2483, "M", "(16)"),
+ (0x2484, "M", "(17)"),
+ (0x2485, "M", "(18)"),
+ (0x2486, "M", "(19)"),
+ (0x2487, "M", "(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)"),
+ (0x249C, "M", "(a)"),
+ (0x249D, "M", "(b)"),
+ (0x249E, "M", "(c)"),
+ (0x249F, "M", "(d)"),
+ ]
+
+
+def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
+ (0x24A0, "M", "(e)"),
+ (0x24A1, "M", "(f)"),
+ (0x24A2, "M", "(g)"),
+ (0x24A3, "M", "(h)"),
+ (0x24A4, "M", "(i)"),
+ (0x24A5, "M", "(j)"),
+ (0x24A6, "M", "(k)"),
+ (0x24A7, "M", "(l)"),
+ (0x24A8, "M", "(m)"),
+ (0x24A9, "M", "(n)"),
+ (0x24AA, "M", "(o)"),
+ (0x24AB, "M", "(p)"),
+ (0x24AC, "M", "(q)"),
+ (0x24AD, "M", "(r)"),
+ (0x24AE, "M", "(s)"),
+ (0x24AF, "M", "(t)"),
+ (0x24B0, "M", "(u)"),
+ (0x24B1, "M", "(v)"),
+ (0x24B2, "M", "(w)"),
+ (0x24B3, "M", "(x)"),
+ (0x24B4, "M", "(y)"),
+ (0x24B5, "M", "(z)"),
(0x24B6, "M", "a"),
(0x24B7, "M", "b"),
(0x24B8, "M", "c"),
@@ -2526,11 +2564,6 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -2576,9 +2609,9 @@ def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x24EB, "V"),
(0x2A0C, "M", "∫∫∫∫"),
(0x2A0D, "V"),
- (0x2A74, "3", "::="),
- (0x2A75, "3", "=="),
- (0x2A76, "3", "==="),
+ (0x2A74, "M", "::="),
+ (0x2A75, "M", "=="),
+ (0x2A76, "M", "==="),
(0x2A77, "V"),
(0x2ADC, "M", "⫝̸"),
(0x2ADD, "V"),
@@ -2598,6 +2631,11 @@ def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2C09, "M", "ⰹ"),
(0x2C0A, "M", "ⰺ"),
(0x2C0B, "M", "ⰻ"),
+ ]
+
+
+def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2C0C, "M", "ⰼ"),
(0x2C0D, "M", "ⰽ"),
(0x2C0E, "M", "ⰾ"),
@@ -2631,11 +2669,6 @@ def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ⱟ"),
@@ -2703,6 +2736,11 @@ def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2CA3, "V"),
(0x2CA4, "M", "ⲥ"),
(0x2CA5, "V"),
+ ]
+
+
+def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2CA6, "M", "ⲧ"),
(0x2CA7, "V"),
(0x2CA8, "M", "ⲩ"),
@@ -2736,11 +2774,6 @@ def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -2808,6 +2841,11 @@ def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2DDF, "X"),
(0x2DE0, "V"),
(0x2E5E, "X"),
+ ]
+
+
+def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2E80, "V"),
(0x2E9A, "X"),
(0x2E9B, "V"),
@@ -2841,11 +2879,6 @@ def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "又"),
@@ -2913,6 +2946,11 @@ def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F5A, "M", "片"),
(0x2F5B, "M", "牙"),
(0x2F5C, "M", "牛"),
+ ]
+
+
+def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2F5D, "M", "犬"),
(0x2F5E, "M", "玄"),
(0x2F5F, "M", "玉"),
@@ -2946,11 +2984,6 @@ def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "聿"),
@@ -3018,6 +3051,11 @@ def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2FBE, "M", "鬥"),
(0x2FBF, "M", "鬯"),
(0x2FC0, "M", "鬲"),
+ ]
+
+
+def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2FC1, "M", "鬼"),
(0x2FC2, "M", "魚"),
(0x2FC3, "M", "鳥"),
@@ -3040,7 +3078,7 @@ def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2FD4, "M", "龜"),
(0x2FD5, "M", "龠"),
(0x2FD6, "X"),
- (0x3000, "3", " "),
+ (0x3000, "M", " "),
(0x3001, "V"),
(0x3002, "M", "."),
(0x3003, "V"),
@@ -3051,16 +3089,11 @@ def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", " ゚"),
+ (0x309B, "M", " ゙"),
+ (0x309C, "M", " ゚"),
(0x309D, "V"),
(0x309F, "M", "より"),
(0x30A0, "V"),
@@ -3119,10 +3152,15 @@ def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x3161, "M", "ᅳ"),
(0x3162, "M", "ᅴ"),
(0x3163, "M", "ᅵ"),
- (0x3164, "X"),
+ (0x3164, "I"),
(0x3165, "M", "ᄔ"),
(0x3166, "M", "ᄕ"),
(0x3167, "M", "ᇇ"),
+ ]
+
+
+def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x3168, "M", "ᇈ"),
(0x3169, "M", "ᇌ"),
(0x316A, "M", "ᇎ"),
@@ -3156,11 +3194,6 @@ def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ᆒ"),
@@ -3184,76 +3217,81 @@ def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x319E, "M", "地"),
(0x319F, "M", "人"),
(0x31A0, "V"),
- (0x31E4, "X"),
+ (0x31E6, "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", "(오후)"),
+ (0x3200, "M", "(ᄀ)"),
+ (0x3201, "M", "(ᄂ)"),
+ (0x3202, "M", "(ᄃ)"),
+ (0x3203, "M", "(ᄅ)"),
+ (0x3204, "M", "(ᄆ)"),
+ (0x3205, "M", "(ᄇ)"),
+ (0x3206, "M", "(ᄉ)"),
+ (0x3207, "M", "(ᄋ)"),
+ (0x3208, "M", "(ᄌ)"),
+ (0x3209, "M", "(ᄎ)"),
+ (0x320A, "M", "(ᄏ)"),
+ (0x320B, "M", "(ᄐ)"),
+ (0x320C, "M", "(ᄑ)"),
+ (0x320D, "M", "(ᄒ)"),
+ (0x320E, "M", "(가)"),
+ (0x320F, "M", "(나)"),
+ (0x3210, "M", "(다)"),
+ (0x3211, "M", "(라)"),
+ (0x3212, "M", "(마)"),
+ (0x3213, "M", "(바)"),
+ (0x3214, "M", "(사)"),
+ (0x3215, "M", "(아)"),
+ (0x3216, "M", "(자)"),
+ (0x3217, "M", "(차)"),
+ (0x3218, "M", "(카)"),
+ (0x3219, "M", "(타)"),
+ (0x321A, "M", "(파)"),
+ (0x321B, "M", "(하)"),
+ (0x321C, "M", "(주)"),
+ (0x321D, "M", "(오전)"),
+ (0x321E, "M", "(오후)"),
(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", "(至)"),
+ (0x3220, "M", "(一)"),
+ (0x3221, "M", "(二)"),
+ (0x3222, "M", "(三)"),
+ (0x3223, "M", "(四)"),
+ (0x3224, "M", "(五)"),
+ (0x3225, "M", "(六)"),
+ (0x3226, "M", "(七)"),
+ (0x3227, "M", "(八)"),
+ (0x3228, "M", "(九)"),
+ (0x3229, "M", "(十)"),
+ ]
+
+
+def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
+ (0x322A, "M", "(月)"),
+ (0x322B, "M", "(火)"),
+ (0x322C, "M", "(水)"),
+ (0x322D, "M", "(木)"),
+ (0x322E, "M", "(金)"),
+ (0x322F, "M", "(土)"),
+ (0x3230, "M", "(日)"),
+ (0x3231, "M", "(株)"),
+ (0x3232, "M", "(有)"),
+ (0x3233, "M", "(社)"),
+ (0x3234, "M", "(名)"),
+ (0x3235, "M", "(特)"),
+ (0x3236, "M", "(財)"),
+ (0x3237, "M", "(祝)"),
+ (0x3238, "M", "(労)"),
+ (0x3239, "M", "(代)"),
+ (0x323A, "M", "(呼)"),
+ (0x323B, "M", "(学)"),
+ (0x323C, "M", "(監)"),
+ (0x323D, "M", "(企)"),
+ (0x323E, "M", "(資)"),
+ (0x323F, "M", "(協)"),
+ (0x3240, "M", "(祭)"),
+ (0x3241, "M", "(休)"),
+ (0x3242, "M", "(自)"),
+ (0x3243, "M", "(至)"),
(0x3244, "M", "問"),
(0x3245, "M", "幼"),
(0x3246, "M", "文"),
@@ -3261,11 +3299,6 @@ def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -3333,6 +3366,11 @@ def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x3292, "M", "有"),
(0x3293, "M", "社"),
(0x3294, "M", "名"),
+ ]
+
+
+def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x3295, "M", "特"),
(0x3296, "M", "財"),
(0x3297, "M", "祝"),
@@ -3366,11 +3404,6 @@ def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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,6 +3471,11 @@ def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x32F6, "M", "ラ"),
(0x32F7, "M", "リ"),
(0x32F8, "M", "ル"),
+ ]
+
+
+def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x32F9, "M", "レ"),
(0x32FA, "M", "ロ"),
(0x32FB, "M", "ワ"),
@@ -3471,11 +3509,6 @@ def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ケース"),
@@ -3543,6 +3576,11 @@ def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x335A, "M", "2点"),
(0x335B, "M", "3点"),
(0x335C, "M", "4点"),
+ ]
+
+
+def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x335D, "M", "5点"),
(0x335E, "M", "6点"),
(0x335F, "M", "7点"),
@@ -3576,11 +3614,6 @@ def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -3648,6 +3681,11 @@ def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x33BE, "M", "kw"),
(0x33BF, "M", "mw"),
(0x33C0, "M", "kω"),
+ ]
+
+
+def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x33C1, "M", "mω"),
(0x33C2, "X"),
(0x33C3, "M", "bq"),
@@ -3681,11 +3719,6 @@ def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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日"),
@@ -3753,6 +3786,11 @@ def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xA65C, "M", "ꙝ"),
(0xA65D, "V"),
(0xA65E, "M", "ꙟ"),
+ ]
+
+
+def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xA65F, "V"),
(0xA660, "M", "ꙡ"),
(0xA661, "V"),
@@ -3786,11 +3824,6 @@ def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ꚕ"),
@@ -3858,6 +3891,11 @@ def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xA755, "V"),
(0xA756, "M", "ꝗ"),
(0xA757, "V"),
+ ]
+
+
+def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xA758, "M", "ꝙ"),
(0xA759, "V"),
(0xA75A, "M", "ꝛ"),
@@ -3891,11 +3929,6 @@ def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ꞃ"),
@@ -3963,9 +3996,17 @@ def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xA7C6, "M", "ᶎ"),
(0xA7C7, "M", "ꟈ"),
(0xA7C8, "V"),
+ ]
+
+
+def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xA7C9, "M", "ꟊ"),
(0xA7CA, "V"),
- (0xA7CB, "X"),
+ (0xA7CB, "M", "ɤ"),
+ (0xA7CC, "M", ""),
+ (0xA7CD, "V"),
+ (0xA7CE, "X"),
(0xA7D0, "M", "ꟑ"),
(0xA7D1, "V"),
(0xA7D2, "X"),
@@ -3976,7 +4017,10 @@ def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xA7D7, "V"),
(0xA7D8, "M", "ꟙ"),
(0xA7D9, "V"),
- (0xA7DA, "X"),
+ (0xA7DA, "M", ""),
+ (0xA7DB, "V"),
+ (0xA7DC, "M", "ƛ"),
+ (0xA7DD, "X"),
(0xA7F2, "M", "c"),
(0xA7F3, "M", "f"),
(0xA7F4, "M", "q"),
@@ -3996,11 +4040,6 @@ def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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,6 +4101,11 @@ def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xAB85, "M", "Ꮅ"),
(0xAB86, "M", "Ꮆ"),
(0xAB87, "M", "Ꮇ"),
+ ]
+
+
+def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xAB88, "M", "Ꮈ"),
(0xAB89, "M", "Ꮉ"),
(0xAB8A, "M", "Ꮊ"),
@@ -4101,11 +4145,6 @@ def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "Ꮱ"),
@@ -4167,6 +4206,11 @@ def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xF920, "M", "鸞"),
(0xF921, "M", "嵐"),
(0xF922, "M", "濫"),
+ ]
+
+
+def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xF923, "M", "藍"),
(0xF924, "M", "襤"),
(0xF925, "M", "拉"),
@@ -4206,11 +4250,6 @@ def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "樓"),
@@ -4272,6 +4311,11 @@ def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xF984, "M", "濾"),
(0xF985, "M", "礪"),
(0xF986, "M", "閭"),
+ ]
+
+
+def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xF987, "M", "驪"),
(0xF988, "M", "麗"),
(0xF989, "M", "黎"),
@@ -4311,11 +4355,6 @@ def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "聆"),
@@ -4377,6 +4416,11 @@ def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xF9E8, "M", "裡"),
(0xF9E9, "M", "里"),
(0xF9EA, "M", "離"),
+ ]
+
+
+def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xF9EB, "M", "匿"),
(0xF9EC, "M", "溺"),
(0xF9ED, "M", "吝"),
@@ -4416,11 +4460,6 @@ def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "猪"),
@@ -4482,6 +4521,11 @@ def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFA51, "M", "祝"),
(0xFA52, "M", "禍"),
(0xFA53, "M", "禎"),
+ ]
+
+
+def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFA54, "M", "穀"),
(0xFA55, "M", "突"),
(0xFA56, "M", "節"),
@@ -4521,11 +4565,6 @@ def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "奔"),
@@ -4587,6 +4626,11 @@ def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFAB7, "M", "覆"),
(0xFAB8, "M", "視"),
(0xFAB9, "M", "調"),
+ ]
+
+
+def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFABA, "M", "諸"),
(0xFABB, "M", "請"),
(0xFABC, "M", "謁"),
@@ -4626,11 +4670,6 @@ def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "մե"),
@@ -4650,7 +4689,7 @@ def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFB26, "M", "ם"),
(0xFB27, "M", "ר"),
(0xFB28, "M", "ת"),
- (0xFB29, "3", "+"),
+ (0xFB29, "M", "+"),
(0xFB2A, "M", "שׁ"),
(0xFB2B, "M", "שׂ"),
(0xFB2C, "M", "שּׁ"),
@@ -4692,6 +4731,11 @@ def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFB50, "M", "ٱ"),
(0xFB52, "M", "ٻ"),
(0xFB56, "M", "پ"),
+ ]
+
+
+def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFB5A, "M", "ڀ"),
(0xFB5E, "M", "ٺ"),
(0xFB62, "M", "ٿ"),
@@ -4731,11 +4775,6 @@ def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ئو"),
@@ -4797,6 +4836,11 @@ def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFC31, "M", "فى"),
(0xFC32, "M", "في"),
(0xFC33, "M", "قح"),
+ ]
+
+
+def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFC34, "M", "قم"),
(0xFC35, "M", "قى"),
(0xFC36, "M", "قي"),
@@ -4836,20 +4880,15 @@ def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", " ّٰ"),
+ (0xFC5E, "M", " ٌّ"),
+ (0xFC5F, "M", " ٍّ"),
+ (0xFC60, "M", " َّ"),
+ (0xFC61, "M", " ُّ"),
+ (0xFC62, "M", " ِّ"),
+ (0xFC63, "M", " ّٰ"),
(0xFC64, "M", "ئر"),
(0xFC65, "M", "ئز"),
(0xFC66, "M", "ئم"),
@@ -4902,6 +4941,11 @@ def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFC95, "M", "يى"),
(0xFC96, "M", "يي"),
(0xFC97, "M", "ئج"),
+ ]
+
+
+def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFC98, "M", "ئح"),
(0xFC99, "M", "ئخ"),
(0xFC9A, "M", "ئم"),
@@ -4941,11 +4985,6 @@ def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "فم"),
@@ -5007,6 +5046,11 @@ def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFCF9, "M", "غى"),
(0xFCFA, "M", "غي"),
(0xFCFB, "M", "سى"),
+ ]
+
+
+def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFCFC, "M", "سي"),
(0xFCFD, "M", "شى"),
(0xFCFE, "M", "شي"),
@@ -5046,11 +5090,6 @@ def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "شج"),
@@ -5112,6 +5151,11 @@ def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFD7A, "M", "غمي"),
(0xFD7B, "M", "غمى"),
(0xFD7C, "M", "فخم"),
+ ]
+
+
+def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFD7E, "M", "قمح"),
(0xFD7F, "M", "قمم"),
(0xFD80, "M", "لحم"),
@@ -5151,11 +5195,6 @@ def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "لمي"),
@@ -5198,18 +5237,18 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFDF7, "M", "عليه"),
(0xFDF8, "M", "وسلم"),
(0xFDF9, "M", "صلى"),
- (0xFDFA, "3", "صلى الله عليه وسلم"),
- (0xFDFB, "3", "جل جلاله"),
+ (0xFDFA, "M", "صلى الله عليه وسلم"),
+ (0xFDFB, "M", "جل جلاله"),
(0xFDFC, "M", "ریال"),
(0xFDFD, "V"),
(0xFE00, "I"),
- (0xFE10, "3", ","),
+ (0xFE10, "M", ","),
(0xFE11, "M", "、"),
(0xFE12, "X"),
- (0xFE13, "3", ":"),
- (0xFE14, "3", ";"),
- (0xFE15, "3", "!"),
- (0xFE16, "3", "?"),
+ (0xFE13, "M", ":"),
+ (0xFE14, "M", ";"),
+ (0xFE15, "M", "!"),
+ (0xFE16, "M", "?"),
(0xFE17, "M", "〖"),
(0xFE18, "M", "〗"),
(0xFE19, "X"),
@@ -5217,11 +5256,16 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFE30, "X"),
(0xFE31, "M", "—"),
(0xFE32, "M", "–"),
- (0xFE33, "3", "_"),
- (0xFE35, "3", "("),
- (0xFE36, "3", ")"),
- (0xFE37, "3", "{"),
- (0xFE38, "3", "}"),
+ ]
+
+
+def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
+ (0xFE33, "M", "_"),
+ (0xFE35, "M", "("),
+ (0xFE36, "M", ")"),
+ (0xFE37, "M", "{"),
+ (0xFE38, "M", "}"),
(0xFE39, "M", "〔"),
(0xFE3A, "M", "〕"),
(0xFE3B, "M", "【"),
@@ -5235,58 +5279,53 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFE43, "M", "『"),
(0xFE44, "M", "』"),
(0xFE45, "V"),
- (0xFE47, "3", "["),
- (0xFE48, "3", "]"),
- (0xFE49, "3", " ̅"),
- (0xFE4D, "3", "_"),
- (0xFE50, "3", ","),
+ (0xFE47, "M", "["),
+ (0xFE48, "M", "]"),
+ (0xFE49, "M", " ̅"),
+ (0xFE4D, "M", "_"),
+ (0xFE50, "M", ","),
(0xFE51, "M", "、"),
(0xFE52, "X"),
- (0xFE54, "3", ";"),
- (0xFE55, "3", ":"),
- (0xFE56, "3", "?"),
- (0xFE57, "3", "!"),
+ (0xFE54, "M", ";"),
+ (0xFE55, "M", ":"),
+ (0xFE56, "M", "?"),
+ (0xFE57, "M", "!"),
(0xFE58, "M", "—"),
- (0xFE59, "3", "("),
- (0xFE5A, "3", ")"),
- (0xFE5B, "3", "{"),
- (0xFE5C, "3", "}"),
+ (0xFE59, "M", "("),
+ (0xFE5A, "M", ")"),
+ (0xFE5B, "M", "{"),
+ (0xFE5C, "M", "}"),
(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", "+"),
+ (0xFE5F, "M", "#"),
+ (0xFE60, "M", "&"),
+ (0xFE61, "M", "*"),
+ (0xFE62, "M", "+"),
(0xFE63, "M", "-"),
- (0xFE64, "3", "<"),
- (0xFE65, "3", ">"),
- (0xFE66, "3", "="),
+ (0xFE64, "M", "<"),
+ (0xFE65, "M", ">"),
+ (0xFE66, "M", "="),
(0xFE67, "X"),
- (0xFE68, "3", "\\"),
- (0xFE69, "3", "$"),
- (0xFE6A, "3", "%"),
- (0xFE6B, "3", "@"),
+ (0xFE68, "M", "\\"),
+ (0xFE69, "M", "$"),
+ (0xFE6A, "M", "%"),
+ (0xFE6B, "M", "@"),
(0xFE6C, "X"),
- (0xFE70, "3", " ً"),
+ (0xFE70, "M", " ً"),
(0xFE71, "M", "ـً"),
- (0xFE72, "3", " ٌ"),
+ (0xFE72, "M", " ٌ"),
(0xFE73, "V"),
- (0xFE74, "3", " ٍ"),
+ (0xFE74, "M", " ٍ"),
(0xFE75, "X"),
- (0xFE76, "3", " َ"),
+ (0xFE76, "M", " َ"),
(0xFE77, "M", "ـَ"),
- (0xFE78, "3", " ُ"),
+ (0xFE78, "M", " ُ"),
(0xFE79, "M", "ـُ"),
- (0xFE7A, "3", " ِ"),
+ (0xFE7A, "M", " ِ"),
(0xFE7B, "M", "ـِ"),
- (0xFE7C, "3", " ّ"),
+ (0xFE7C, "M", " ّ"),
(0xFE7D, "M", "ـّ"),
- (0xFE7E, "3", " ْ"),
+ (0xFE7E, "M", " ْ"),
(0xFE7F, "M", "ـْ"),
(0xFE80, "M", "ء"),
(0xFE81, "M", "آ"),
@@ -5322,6 +5361,11 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFEE5, "M", "ن"),
(0xFEE9, "M", "ه"),
(0xFEED, "M", "و"),
+ ]
+
+
+def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFEEF, "M", "ى"),
(0xFEF1, "M", "ي"),
(0xFEF5, "M", "لآ"),
@@ -5331,21 +5375,21 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", ","),
+ (0xFF01, "M", "!"),
+ (0xFF02, "M", '"'),
+ (0xFF03, "M", "#"),
+ (0xFF04, "M", "$"),
+ (0xFF05, "M", "%"),
+ (0xFF06, "M", "&"),
+ (0xFF07, "M", "'"),
+ (0xFF08, "M", "("),
+ (0xFF09, "M", ")"),
+ (0xFF0A, "M", "*"),
+ (0xFF0B, "M", "+"),
+ (0xFF0C, "M", ","),
(0xFF0D, "M", "-"),
(0xFF0E, "M", "."),
- (0xFF0F, "3", "/"),
+ (0xFF0F, "M", "/"),
(0xFF10, "M", "0"),
(0xFF11, "M", "1"),
(0xFF12, "M", "2"),
@@ -5356,18 +5400,13 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "@"),
+ (0xFF1A, "M", ":"),
+ (0xFF1B, "M", ";"),
+ (0xFF1C, "M", "<"),
+ (0xFF1D, "M", "="),
+ (0xFF1E, "M", ">"),
+ (0xFF1F, "M", "?"),
+ (0xFF20, "M", "@"),
(0xFF21, "M", "a"),
(0xFF22, "M", "b"),
(0xFF23, "M", "c"),
@@ -5394,12 +5433,12 @@ def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFF38, "M", "x"),
(0xFF39, "M", "y"),
(0xFF3A, "M", "z"),
- (0xFF3B, "3", "["),
- (0xFF3C, "3", "\\"),
- (0xFF3D, "3", "]"),
- (0xFF3E, "3", "^"),
- (0xFF3F, "3", "_"),
- (0xFF40, "3", "`"),
+ (0xFF3B, "M", "["),
+ (0xFF3C, "M", "\\"),
+ (0xFF3D, "M", "]"),
+ (0xFF3E, "M", "^"),
+ (0xFF3F, "M", "_"),
+ (0xFF40, "M", "`"),
(0xFF41, "M", "a"),
(0xFF42, "M", "b"),
(0xFF43, "M", "c"),
@@ -5426,10 +5465,15 @@ def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFF58, "M", "x"),
(0xFF59, "M", "y"),
(0xFF5A, "M", "z"),
- (0xFF5B, "3", "{"),
- (0xFF5C, "3", "|"),
- (0xFF5D, "3", "}"),
- (0xFF5E, "3", "~"),
+ (0xFF5B, "M", "{"),
+ ]
+
+
+def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
+ (0xFF5C, "M", "|"),
+ (0xFF5D, "M", "}"),
+ (0xFF5E, "M", "~"),
(0xFF5F, "M", "⦅"),
(0xFF60, "M", "⦆"),
(0xFF61, "M", "."),
@@ -5466,11 +5510,6 @@ def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ナ"),
@@ -5500,7 +5539,7 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFF9D, "M", "ン"),
(0xFF9E, "M", "゙"),
(0xFF9F, "M", "゚"),
- (0xFFA0, "X"),
+ (0xFFA0, "I"),
(0xFFA1, "M", "ᄀ"),
(0xFFA2, "M", "ᄁ"),
(0xFFA3, "M", "ᆪ"),
@@ -5532,6 +5571,11 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFFBD, "M", "ᄑ"),
(0xFFBE, "M", "ᄒ"),
(0xFFBF, "X"),
+ ]
+
+
+def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0xFFC2, "M", "ᅡ"),
(0xFFC3, "M", "ᅢ"),
(0xFFC4, "M", "ᅣ"),
@@ -5560,7 +5604,7 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0xFFE0, "M", "¢"),
(0xFFE1, "M", "£"),
(0xFFE2, "M", "¬"),
- (0xFFE3, "3", " ̄"),
+ (0xFFE3, "M", " ̄"),
(0xFFE4, "M", "¦"),
(0xFFE5, "M", "¥"),
(0xFFE6, "M", "₩"),
@@ -5571,11 +5615,6 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -5637,6 +5676,11 @@ def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1040C, "M", "𐐴"),
(0x1040D, "M", "𐐵"),
(0x1040E, "M", "𐐶"),
+ ]
+
+
+def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1040F, "M", "𐐷"),
(0x10410, "M", "𐐸"),
(0x10411, "M", "𐐹"),
@@ -5676,11 +5720,6 @@ def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "𐓤"),
@@ -5742,6 +5781,11 @@ def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x10588, "M", "𐖯"),
(0x10589, "M", "𐖰"),
(0x1058A, "M", "𐖱"),
+ ]
+
+
+def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1058B, "X"),
(0x1058C, "M", "𐖳"),
(0x1058D, "M", "𐖴"),
@@ -5762,6 +5806,8 @@ def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x105BA, "X"),
(0x105BB, "V"),
(0x105BD, "X"),
+ (0x105C0, "V"),
+ (0x105F4, "X"),
(0x10600, "V"),
(0x10737, "X"),
(0x10740, "V"),
@@ -5781,11 +5827,6 @@ def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ɞ"),
@@ -5845,6 +5886,11 @@ def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1083D, "X"),
(0x1083F, "V"),
(0x10856, "X"),
+ ]
+
+
+def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x10857, "V"),
(0x1089F, "X"),
(0x108A7, "V"),
@@ -5886,11 +5932,6 @@ def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -5950,6 +5991,11 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x10CAB, "M", "𐳫"),
(0x10CAC, "M", "𐳬"),
(0x10CAD, "M", "𐳭"),
+ ]
+
+
+def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x10CAE, "M", "𐳮"),
(0x10CAF, "M", "𐳯"),
(0x10CB0, "M", "𐳰"),
@@ -5962,6 +6008,34 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x10D28, "X"),
(0x10D30, "V"),
(0x10D3A, "X"),
+ (0x10D40, "V"),
+ (0x10D50, "M", ""),
+ (0x10D51, "M", ""),
+ (0x10D52, "M", ""),
+ (0x10D53, "M", ""),
+ (0x10D54, "M", ""),
+ (0x10D55, "M", ""),
+ (0x10D56, "M", ""),
+ (0x10D57, "M", ""),
+ (0x10D58, "M", ""),
+ (0x10D59, "M", ""),
+ (0x10D5A, "M", ""),
+ (0x10D5B, "M", ""),
+ (0x10D5C, "M", ""),
+ (0x10D5D, "M", ""),
+ (0x10D5E, "M", ""),
+ (0x10D5F, "M", ""),
+ (0x10D60, "M", ""),
+ (0x10D61, "M", ""),
+ (0x10D62, "M", ""),
+ (0x10D63, "M", ""),
+ (0x10D64, "M", ""),
+ (0x10D65, "M", ""),
+ (0x10D66, "X"),
+ (0x10D69, "V"),
+ (0x10D86, "X"),
+ (0x10D8E, "V"),
+ (0x10D90, "X"),
(0x10E60, "V"),
(0x10E7F, "X"),
(0x10E80, "V"),
@@ -5970,7 +6044,9 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x10EAE, "X"),
(0x10EB0, "V"),
(0x10EB2, "X"),
- (0x10EFD, "V"),
+ (0x10EC2, "V"),
+ (0x10EC5, "X"),
+ (0x10EFC, "V"),
(0x10F28, "X"),
(0x10F30, "V"),
(0x10F5A, "X"),
@@ -5991,11 +6067,6 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -6025,6 +6096,11 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x112EB, "X"),
(0x112F0, "V"),
(0x112FA, "X"),
+ ]
+
+
+def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x11300, "V"),
(0x11304, "X"),
(0x11305, "V"),
@@ -6055,6 +6131,28 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1136D, "X"),
(0x11370, "V"),
(0x11375, "X"),
+ (0x11380, "V"),
+ (0x1138A, "X"),
+ (0x1138B, "V"),
+ (0x1138C, "X"),
+ (0x1138E, "V"),
+ (0x1138F, "X"),
+ (0x11390, "V"),
+ (0x113B6, "X"),
+ (0x113B7, "V"),
+ (0x113C1, "X"),
+ (0x113C2, "V"),
+ (0x113C3, "X"),
+ (0x113C5, "V"),
+ (0x113C6, "X"),
+ (0x113C7, "V"),
+ (0x113CB, "X"),
+ (0x113CC, "V"),
+ (0x113D6, "X"),
+ (0x113D7, "V"),
+ (0x113D9, "X"),
+ (0x113E1, "V"),
+ (0x113E3, "X"),
(0x11400, "V"),
(0x1145C, "X"),
(0x1145D, "V"),
@@ -6077,6 +6175,8 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x116BA, "X"),
(0x116C0, "V"),
(0x116CA, "X"),
+ (0x116D0, "V"),
+ (0x116E4, "X"),
(0x11700, "V"),
(0x1171B, "X"),
(0x1171D, "V"),
@@ -6096,16 +6196,16 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "𑣏"),
+ ]
+
+
+def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x118B0, "M", "𑣐"),
(0x118B1, "M", "𑣑"),
(0x118B2, "M", "𑣒"),
@@ -6154,6 +6254,10 @@ def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x11AF9, "X"),
(0x11B00, "V"),
(0x11B0A, "X"),
+ (0x11BC0, "V"),
+ (0x11BE2, "X"),
+ (0x11BF0, "V"),
+ (0x11BFA, "X"),
(0x11C00, "V"),
(0x11C09, "X"),
(0x11C0A, "V"),
@@ -6201,12 +6305,12 @@ def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x11F12, "V"),
(0x11F3B, "X"),
(0x11F3E, "V"),
+ (0x11F5B, "X"),
]
-def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
return [
- (0x11F5A, "X"),
(0x11FB0, "V"),
(0x11FB1, "X"),
(0x11FC0, "V"),
@@ -6225,8 +6329,12 @@ def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x13430, "X"),
(0x13440, "V"),
(0x13456, "X"),
+ (0x13460, "V"),
+ (0x143FB, "X"),
(0x14400, "V"),
(0x14647, "X"),
+ (0x16100, "V"),
+ (0x1613A, "X"),
(0x16800, "V"),
(0x16A39, "X"),
(0x16A40, "V"),
@@ -6251,6 +6359,8 @@ def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x16B78, "X"),
(0x16B7D, "V"),
(0x16B90, "X"),
+ (0x16D40, "V"),
+ (0x16D7A, "X"),
(0x16E40, "M", "𖹠"),
(0x16E41, "M", "𖹡"),
(0x16E42, "M", "𖹢"),
@@ -6299,18 +6409,18 @@ def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x187F8, "X"),
(0x18800, "V"),
(0x18CD6, "X"),
- (0x18D00, "V"),
+ (0x18CFF, "V"),
(0x18D09, "X"),
+ ]
+
+
+def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(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"),
@@ -6335,6 +6445,46 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1BC9C, "V"),
(0x1BCA0, "I"),
(0x1BCA4, "X"),
+ (0x1CC00, "V"),
+ (0x1CCD6, "M", "a"),
+ (0x1CCD7, "M", "b"),
+ (0x1CCD8, "M", "c"),
+ (0x1CCD9, "M", "d"),
+ (0x1CCDA, "M", "e"),
+ (0x1CCDB, "M", "f"),
+ (0x1CCDC, "M", "g"),
+ (0x1CCDD, "M", "h"),
+ (0x1CCDE, "M", "i"),
+ (0x1CCDF, "M", "j"),
+ (0x1CCE0, "M", "k"),
+ (0x1CCE1, "M", "l"),
+ (0x1CCE2, "M", "m"),
+ (0x1CCE3, "M", "n"),
+ (0x1CCE4, "M", "o"),
+ (0x1CCE5, "M", "p"),
+ (0x1CCE6, "M", "q"),
+ (0x1CCE7, "M", "r"),
+ (0x1CCE8, "M", "s"),
+ (0x1CCE9, "M", "t"),
+ (0x1CCEA, "M", "u"),
+ (0x1CCEB, "M", "v"),
+ (0x1CCEC, "M", "w"),
+ (0x1CCED, "M", "x"),
+ (0x1CCEE, "M", "y"),
+ (0x1CCEF, "M", "z"),
+ (0x1CCF0, "M", "0"),
+ (0x1CCF1, "M", "1"),
+ (0x1CCF2, "M", "2"),
+ (0x1CCF3, "M", "3"),
+ (0x1CCF4, "M", "4"),
+ (0x1CCF5, "M", "5"),
+ (0x1CCF6, "M", "6"),
+ (0x1CCF7, "M", "7"),
+ (0x1CCF8, "M", "8"),
+ (0x1CCF9, "M", "9"),
+ (0x1CCFA, "X"),
+ (0x1CD00, "V"),
+ (0x1CEB4, "X"),
(0x1CF00, "V"),
(0x1CF2E, "X"),
(0x1CF30, "V"),
@@ -6354,7 +6504,7 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D163, "M", "𝅘𝅥𝅱"),
(0x1D164, "M", "𝅘𝅥𝅲"),
(0x1D165, "V"),
- (0x1D173, "X"),
+ (0x1D173, "I"),
(0x1D17B, "V"),
(0x1D1BB, "M", "𝆹𝅥"),
(0x1D1BC, "M", "𝆺𝅥"),
@@ -6366,6 +6516,11 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D1EB, "X"),
(0x1D200, "V"),
(0x1D246, "X"),
+ ]
+
+
+def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D2C0, "V"),
(0x1D2D4, "X"),
(0x1D2E0, "V"),
@@ -6411,11 +6566,6 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -6471,6 +6621,11 @@ def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D459, "M", "l"),
(0x1D45A, "M", "m"),
(0x1D45B, "M", "n"),
+ ]
+
+
+def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D45C, "M", "o"),
(0x1D45D, "M", "p"),
(0x1D45E, "M", "q"),
@@ -6516,11 +6671,6 @@ def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -6576,6 +6726,11 @@ def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D4C0, "M", "k"),
(0x1D4C1, "M", "l"),
(0x1D4C2, "M", "m"),
+ ]
+
+
+def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D4C3, "M", "n"),
(0x1D4C4, "X"),
(0x1D4C5, "M", "p"),
@@ -6621,11 +6776,6 @@ def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -6681,6 +6831,11 @@ def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D525, "M", "h"),
(0x1D526, "M", "i"),
(0x1D527, "M", "j"),
+ ]
+
+
+def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D528, "M", "k"),
(0x1D529, "M", "l"),
(0x1D52A, "M", "m"),
@@ -6726,11 +6881,6 @@ def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -6786,6 +6936,11 @@ def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D58B, "M", "f"),
(0x1D58C, "M", "g"),
(0x1D58D, "M", "h"),
+ ]
+
+
+def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D58E, "M", "i"),
(0x1D58F, "M", "j"),
(0x1D590, "M", "k"),
@@ -6831,11 +6986,6 @@ def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -6891,6 +7041,11 @@ def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D5EF, "M", "b"),
(0x1D5F0, "M", "c"),
(0x1D5F1, "M", "d"),
+ ]
+
+
+def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D5F2, "M", "e"),
(0x1D5F3, "M", "f"),
(0x1D5F4, "M", "g"),
@@ -6936,11 +7091,6 @@ def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -6996,6 +7146,11 @@ def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D653, "M", "x"),
(0x1D654, "M", "y"),
(0x1D655, "M", "z"),
+ ]
+
+
+def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D656, "M", "a"),
(0x1D657, "M", "b"),
(0x1D658, "M", "c"),
@@ -7041,11 +7196,6 @@ def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
@@ -7101,6 +7251,11 @@ def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D6B8, "M", "ρ"),
(0x1D6B9, "M", "θ"),
(0x1D6BA, "M", "σ"),
+ ]
+
+
+def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D6BB, "M", "τ"),
(0x1D6BC, "M", "υ"),
(0x1D6BD, "M", "φ"),
@@ -7146,11 +7301,6 @@ def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "κ"),
@@ -7206,6 +7356,11 @@ def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D71E, "M", "γ"),
(0x1D71F, "M", "δ"),
(0x1D720, "M", "ε"),
+ ]
+
+
+def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D721, "M", "ζ"),
(0x1D722, "M", "η"),
(0x1D723, "M", "θ"),
@@ -7251,11 +7406,6 @@ def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "θ"),
@@ -7311,6 +7461,11 @@ def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D784, "M", "υ"),
(0x1D785, "M", "φ"),
(0x1D786, "M", "χ"),
+ ]
+
+
+def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D787, "M", "ψ"),
(0x1D788, "M", "ω"),
(0x1D789, "M", "∂"),
@@ -7356,11 +7511,6 @@ def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ν"),
@@ -7416,6 +7566,11 @@ def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1D7EB, "M", "9"),
(0x1D7EC, "M", "0"),
(0x1D7ED, "M", "1"),
+ ]
+
+
+def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1D7EE, "M", "2"),
(0x1D7EF, "M", "3"),
(0x1D7F0, "M", "4"),
@@ -7461,11 +7616,6 @@ def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "к"),
@@ -7521,6 +7671,11 @@ def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1E06B, "M", "ҫ"),
(0x1E06C, "M", "ꙑ"),
(0x1E06D, "M", "ұ"),
+ ]
+
+
+def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1E06E, "X"),
(0x1E08F, "V"),
(0x1E090, "X"),
@@ -7540,6 +7695,10 @@ def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1E300, "X"),
(0x1E4D0, "V"),
(0x1E4FA, "X"),
+ (0x1E5D0, "V"),
+ (0x1E5FB, "X"),
+ (0x1E5FF, "V"),
+ (0x1E600, "X"),
(0x1E7E0, "V"),
(0x1E7E7, "X"),
(0x1E7E8, "V"),
@@ -7566,11 +7725,6 @@ def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "𞤲"),
@@ -7622,6 +7776,11 @@ def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1EE12, "M", "ق"),
(0x1EE13, "M", "ر"),
(0x1EE14, "M", "ش"),
+ ]
+
+
+def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1EE15, "M", "ت"),
(0x1EE16, "M", "ث"),
(0x1EE17, "M", "خ"),
@@ -7671,11 +7830,6 @@ def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ص"),
@@ -7727,6 +7881,11 @@ def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1EE81, "M", "ب"),
(0x1EE82, "M", "ج"),
(0x1EE83, "M", "د"),
+ ]
+
+
+def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1EE84, "M", "ه"),
(0x1EE85, "M", "و"),
(0x1EE86, "M", "ز"),
@@ -7776,11 +7935,6 @@ def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "غ"),
@@ -7799,43 +7953,48 @@ def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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,"),
+ (0x1F101, "M", "0,"),
+ (0x1F102, "M", "1,"),
+ (0x1F103, "M", "2,"),
+ (0x1F104, "M", "3,"),
+ (0x1F105, "M", "4,"),
+ (0x1F106, "M", "5,"),
+ (0x1F107, "M", "6,"),
+ (0x1F108, "M", "7,"),
+ (0x1F109, "M", "8,"),
+ (0x1F10A, "M", "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)"),
+ (0x1F110, "M", "(a)"),
+ (0x1F111, "M", "(b)"),
+ (0x1F112, "M", "(c)"),
+ (0x1F113, "M", "(d)"),
+ (0x1F114, "M", "(e)"),
+ (0x1F115, "M", "(f)"),
+ (0x1F116, "M", "(g)"),
+ (0x1F117, "M", "(h)"),
+ (0x1F118, "M", "(i)"),
+ (0x1F119, "M", "(j)"),
+ (0x1F11A, "M", "(k)"),
+ (0x1F11B, "M", "(l)"),
+ (0x1F11C, "M", "(m)"),
+ (0x1F11D, "M", "(n)"),
+ (0x1F11E, "M", "(o)"),
+ (0x1F11F, "M", "(p)"),
+ (0x1F120, "M", "(q)"),
+ (0x1F121, "M", "(r)"),
+ (0x1F122, "M", "(s)"),
+ (0x1F123, "M", "(t)"),
+ (0x1F124, "M", "(u)"),
+ (0x1F125, "M", "(v)"),
+ ]
+
+
+def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
+ (0x1F126, "M", "(w)"),
+ (0x1F127, "M", "(x)"),
+ (0x1F128, "M", "(y)"),
+ (0x1F129, "M", "(z)"),
(0x1F12A, "M", "〔s〕"),
(0x1F12B, "M", "c"),
(0x1F12C, "M", "r"),
@@ -7881,11 +8040,6 @@ def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "ほか"),
@@ -7937,6 +8091,11 @@ def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1F23A, "M", "営"),
(0x1F23B, "M", "配"),
(0x1F23C, "X"),
+ ]
+
+
+def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x1F240, "M", "〔本〕"),
(0x1F241, "M", "〔三〕"),
(0x1F242, "M", "〔二〕"),
@@ -7977,7 +8136,9 @@ def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x1F890, "V"),
(0x1F8AE, "X"),
(0x1F8B0, "V"),
- (0x1F8B2, "X"),
+ (0x1F8BC, "X"),
+ (0x1F8C0, "V"),
+ (0x1F8C2, "X"),
(0x1F900, "V"),
(0x1FA54, "X"),
(0x1FA60, "V"),
@@ -7985,26 +8146,18 @@ def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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"),
+ (0x1FA8A, "X"),
+ (0x1FA8F, "V"),
+ (0x1FAC7, "X"),
(0x1FACE, "V"),
- (0x1FADC, "X"),
- (0x1FAE0, "V"),
- (0x1FAE9, "X"),
+ (0x1FADD, "X"),
+ (0x1FADF, "V"),
+ (0x1FAEA, "X"),
(0x1FAF0, "V"),
(0x1FAF9, "X"),
(0x1FB00, "V"),
(0x1FB93, "X"),
(0x1FB94, "V"),
- (0x1FBCB, "X"),
(0x1FBF0, "M", "0"),
(0x1FBF1, "M", "1"),
(0x1FBF2, "M", "2"),
@@ -8043,6 +8196,11 @@ def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F80C, "M", "㒞"),
(0x2F80D, "M", "𠘺"),
(0x2F80E, "M", "免"),
+ ]
+
+
+def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2F80F, "M", "兔"),
(0x2F810, "M", "兤"),
(0x2F811, "M", "具"),
@@ -8091,11 +8249,6 @@ def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "啓"),
@@ -8134,7 +8287,7 @@ def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F865, "M", "姘"),
(0x2F866, "M", "婦"),
(0x2F867, "M", "㛮"),
- (0x2F868, "X"),
+ (0x2F868, "M", "㛼"),
(0x2F869, "M", "嬈"),
(0x2F86A, "M", "嬾"),
(0x2F86C, "M", "𡧈"),
@@ -8145,9 +8298,14 @@ def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F871, "M", "𡬘"),
(0x2F872, "M", "寿"),
(0x2F873, "M", "将"),
- (0x2F874, "X"),
+ (0x2F874, "M", "当"),
(0x2F875, "M", "尢"),
(0x2F876, "M", "㞁"),
+ ]
+
+
+def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2F877, "M", "屠"),
(0x2F878, "M", "屮"),
(0x2F879, "M", "峀"),
@@ -8196,11 +8354,6 @@ def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "憎"),
@@ -8253,6 +8406,11 @@ def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F8DA, "M", "朡"),
(0x2F8DB, "M", "杞"),
(0x2F8DC, "M", "杓"),
+ ]
+
+
+def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2F8DD, "M", "𣏃"),
(0x2F8DE, "M", "㭉"),
(0x2F8DF, "M", "柺"),
@@ -8301,11 +8459,6 @@ def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "潮"),
@@ -8324,7 +8477,7 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F91C, "M", "煅"),
(0x2F91D, "M", "𤉣"),
(0x2F91E, "M", "熜"),
- (0x2F91F, "X"),
+ (0x2F91F, "M", "𤎫"),
(0x2F920, "M", "爨"),
(0x2F921, "M", "爵"),
(0x2F922, "M", "牐"),
@@ -8358,6 +8511,11 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F93F, "M", "䀈"),
(0x2F940, "M", "直"),
(0x2F941, "M", "𥃳"),
+ ]
+
+
+def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2F942, "M", "𥃲"),
(0x2F943, "M", "𥄙"),
(0x2F944, "M", "𥄳"),
@@ -8385,7 +8543,7 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F95B, "M", "穏"),
(0x2F95C, "M", "𥥼"),
(0x2F95D, "M", "𥪧"),
- (0x2F95F, "X"),
+ (0x2F95F, "M", "竮"),
(0x2F960, "M", "䈂"),
(0x2F961, "M", "𥮫"),
(0x2F962, "M", "篆"),
@@ -8406,11 +8564,6 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "罺"),
@@ -8463,6 +8616,11 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F9A5, "M", "𦵫"),
(0x2F9A6, "M", "𦳕"),
(0x2F9A7, "M", "䔫"),
+ ]
+
+
+def _seg_82() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2F9A8, "M", "蓱"),
(0x2F9A9, "M", "蓳"),
(0x2F9AA, "M", "蔖"),
@@ -8486,7 +8644,7 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2F9BC, "M", "蜨"),
(0x2F9BD, "M", "蝫"),
(0x2F9BE, "M", "螆"),
- (0x2F9BF, "X"),
+ (0x2F9BF, "M", "䗗"),
(0x2F9C0, "M", "蟡"),
(0x2F9C1, "M", "蠁"),
(0x2F9C2, "M", "䗹"),
@@ -8511,11 +8669,6 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(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", "跋"),
@@ -8568,6 +8721,11 @@ def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
(0x2FA0A, "M", "鬒"),
(0x2FA0B, "M", "鱀"),
(0x2FA0C, "M", "鳽"),
+ ]
+
+
+def _seg_83() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ return [
(0x2FA0D, "M", "䳎"),
(0x2FA0E, "M", "䳭"),
(0x2FA0F, "M", "鵧"),
@@ -8678,4 +8836,6 @@ def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+ _seg_79()
+ _seg_80()
+ _seg_81()
+ + _seg_82()
+ + _seg_83()
) # type: Tuple[Union[Tuple[int, str], Tuple[int, str, str]], ...]
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/msgpack/COPYING b/addons/source-python/packages/site-packages/pip/_vendor/msgpack/COPYING
new file mode 100644
index 000000000..f067af3aa
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/msgpack/COPYING
@@ -0,0 +1,14 @@
+Copyright (C) 2008-2011 INADA Naoki
+
+ 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.
+
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/msgpack/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/msgpack/__init__.py
index b61510544..f3266b701 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/msgpack/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/msgpack/__init__.py
@@ -4,8 +4,8 @@
from .exceptions import * # noqa: F403
from .ext import ExtType, Timestamp
-version = (1, 1, 0)
-__version__ = "1.1.0"
+version = (1, 1, 2)
+__version__ = "1.1.2"
if os.environ.get("MSGPACK_PUREPYTHON"):
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE
new file mode 100644
index 000000000..6f62d44e4
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE
@@ -0,0 +1,3 @@
+This software is made available under the terms of *either* of the licenses
+found in LICENSE.APACHE or LICENSE.BSD. Contributions to this software is made
+under the terms of *both* these licenses.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE.APACHE b/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE.APACHE
new file mode 100644
index 000000000..f433b1a53
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE.APACHE
@@ -0,0 +1,177 @@
+
+ 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
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE.BSD b/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE.BSD
new file mode 100644
index 000000000..42ce7b75c
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/LICENSE.BSD
@@ -0,0 +1,23 @@
+Copyright (c) Donald Stufft and individual 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:
+
+ 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.
+
+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/addons/source-python/packages/site-packages/pip/_vendor/packaging/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/__init__.py
index d79f73c57..21695a74b 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/__init__.py
+++ b/addons/source-python/packages/site-packages/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__ = "26.0"
__author__ = "Donald Stufft and individual contributors"
__email__ = "donald@stufft.io"
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_elffile.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_elffile.py
index 25f4282cc..497b06452 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_elffile.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_elffile.py
@@ -4,7 +4,6 @@
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
"""
@@ -69,8 +68,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/addons/source-python/packages/site-packages/pip/_vendor/packaging/_manylinux.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_manylinux.py
index 61339a6fc..0e79e8a88 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_manylinux.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_manylinux.py
@@ -15,6 +15,16 @@
EF_ARM_ABI_VER5 = 0x05000000
EF_ARM_ABI_FLOAT_HARD = 0x00000400
+_ALLOWED_ARCHS = {
+ "x86_64",
+ "aarch64",
+ "ppc64",
+ "ppc64le",
+ "s390x",
+ "loongarch64",
+ "riscv64",
+}
+
# `os.PathLike` not a generic type until Python 3.9, so sticking with `str`
# as the type for `path` until then.
@@ -57,16 +67,7 @@ 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",
- "riscv64",
- }
- return any(arch in allowed_archs for arch in archs)
+ return any(arch in _ALLOWED_ARCHS for arch in archs)
# If glibc ever changes its major version, we need to know what the last
@@ -106,7 +107,7 @@ def _glibc_version_string_ctypes() -> str | None:
Fallback implementation of glibc_version_string using ctypes.
"""
try:
- import ctypes
+ import ctypes # noqa: PLC0415
except ImportError:
return None
@@ -150,7 +151,7 @@ def _glibc_version_string() -> str | None:
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) -> _GLibCVersion:
"""Parse glibc version.
We use a regexp instead of str.split because we want to discard any
@@ -161,20 +162,19 @@ 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,
)
- return -1, -1
- return int(m.group("major")), int(m.group("minor"))
+ return _GLibCVersion(-1, -1)
+ return _GLibCVersion(int(m.group("major")), int(m.group("minor")))
@functools.lru_cache
-def _get_glibc_version() -> tuple[int, int]:
+def _get_glibc_version() -> _GLibCVersion:
version_str = _glibc_version_string()
if version_str is None:
- return (-1, -1)
+ return _GLibCVersion(-1, -1)
return _parse_glibc_version(version_str)
@@ -185,7 +185,7 @@ def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
return False
# Check for presence of _manylinux module.
try:
- import _manylinux
+ import _manylinux # noqa: PLC0415
except ImportError:
return True
if hasattr(_manylinux, "manylinux_compatible"):
@@ -193,25 +193,26 @@ def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
if result is not None:
return bool(result)
return True
- if version == _GLibCVersion(2, 5):
- if hasattr(_manylinux, "manylinux1_compatible"):
- return bool(_manylinux.manylinux1_compatible)
- if version == _GLibCVersion(2, 12):
- if hasattr(_manylinux, "manylinux2010_compatible"):
- return bool(_manylinux.manylinux2010_compatible)
- if version == _GLibCVersion(2, 17):
- if hasattr(_manylinux, "manylinux2014_compatible"):
- return bool(_manylinux.manylinux2014_compatible)
+ if version == _GLibCVersion(2, 5) and hasattr(_manylinux, "manylinux1_compatible"):
+ return bool(_manylinux.manylinux1_compatible)
+ if version == _GLibCVersion(2, 12) and hasattr(
+ _manylinux, "manylinux2010_compatible"
+ ):
+ return bool(_manylinux.manylinux2010_compatible)
+ if version == _GLibCVersion(2, 17) and hasattr(
+ _manylinux, "manylinux2014_compatible"
+ ):
+ return bool(_manylinux.manylinux2014_compatible)
return True
-_LEGACY_MANYLINUX_MAP = {
+_LEGACY_MANYLINUX_MAP: dict[_GLibCVersion, str] = {
# CentOS 7 w/ glibc 2.17 (PEP 599)
- (2, 17): "manylinux2014",
+ _GLibCVersion(2, 17): "manylinux2014",
# CentOS 6 w/ glibc 2.12 (PEP 571)
- (2, 12): "manylinux2010",
+ _GLibCVersion(2, 12): "manylinux2010",
# CentOS 5 w/ glibc 2.5 (PEP 513)
- (2, 5): "manylinux1",
+ _GLibCVersion(2, 5): "manylinux1",
}
@@ -253,11 +254,9 @@ def platform_tags(archs: Sequence[str]) -> Iterator[str]:
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 "manylinux_{}_{}_{}".format(*glibc_version, arch)
+
+ # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags.
+ if legacy_tag := _LEGACY_MANYLINUX_MAP.get(glibc_version):
yield f"{legacy_tag}_{arch}"
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_musllinux.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_musllinux.py
index d2bf30b56..4e8116a79 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_musllinux.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_musllinux.py
@@ -49,7 +49,7 @@ def _get_musl_version(executable: str) -> _MuslVersion | None:
return None
if ld is None or "musl" not in ld:
return None
- proc = subprocess.run([ld], stderr=subprocess.PIPE, text=True)
+ proc = subprocess.run([ld], check=False, stderr=subprocess.PIPE, text=True)
return _parse_musl_version(proc.stderr)
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_parser.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_parser.py
index c1238c06e..f6c1f5cd2 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_parser.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_parser.py
@@ -7,12 +7,14 @@
from __future__ import annotations
import ast
-from typing import NamedTuple, Sequence, Tuple, Union
+from typing import List, Literal, NamedTuple, Sequence, Tuple, Union
from ._tokenizer import DEFAULT_RULES, Tokenizer
class Node:
+ __slots__ = ("value",)
+
def __init__(self, value: str) -> None:
self.value = value
@@ -20,31 +22,38 @@ def __str__(self) -> str:
return self.value
def __repr__(self) -> str:
- return f"<{self.__class__.__name__}('{self}')>"
+ return f"<{self.__class__.__name__}({self.value!r})>"
def serialize(self) -> str:
raise NotImplementedError
class Variable(Node):
+ __slots__ = ()
+
def serialize(self) -> str:
return str(self)
class Value(Node):
+ __slots__ = ()
+
def serialize(self) -> str:
return f'"{self}"'
class Op(Node):
+ __slots__ = ()
+
def serialize(self) -> str:
return str(self)
+MarkerLogical = Literal["and", "or"]
MarkerVar = Union[Variable, Value]
MarkerItem = Tuple[MarkerVar, Op, MarkerVar]
MarkerAtom = Union[MarkerItem, Sequence["MarkerAtom"]]
-MarkerList = Sequence[Union["MarkerList", MarkerAtom, str]]
+MarkerList = List[Union["MarkerList", MarkerAtom, MarkerLogical]]
class ParsedRequirement(NamedTuple):
@@ -111,7 +120,9 @@ def _parse_requirement_details(
return (url, specifier, marker)
marker = _parse_requirement_marker(
- tokenizer, span_start=url_start, after="URL and whitespace"
+ tokenizer,
+ span_start=url_start,
+ expected="semicolon (after URL and whitespace)",
)
else:
specifier_start = tokenizer.position
@@ -124,10 +135,10 @@ def _parse_requirement_details(
marker = _parse_requirement_marker(
tokenizer,
span_start=specifier_start,
- after=(
- "version specifier"
+ expected=(
+ "comma (within version specifier), semicolon (after version specifier)"
if specifier
- else "name and no valid version specifier"
+ else "semicolon (after name with no version specifier)"
),
)
@@ -135,7 +146,7 @@ def _parse_requirement_details(
def _parse_requirement_marker(
- tokenizer: Tokenizer, *, span_start: int, after: str
+ tokenizer: Tokenizer, *, span_start: int, expected: str
) -> MarkerList:
"""
requirement_marker = SEMICOLON marker WS?
@@ -143,8 +154,9 @@ def _parse_requirement_marker(
if not tokenizer.check("SEMICOLON"):
tokenizer.raise_syntax_error(
- f"Expected end or semicolon (after {after})",
+ f"Expected {expected} or end",
span_start=span_start,
+ span_end=None,
)
tokenizer.read()
@@ -307,7 +319,7 @@ def _parse_marker_item(tokenizer: Tokenizer) -> MarkerItem:
return (marker_var_left, marker_op, marker_var_right)
-def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar:
+def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar: # noqa: RET503
"""
marker_var = VARIABLE | QUOTED_STRING
"""
@@ -349,6 +361,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/addons/source-python/packages/site-packages/pip/_vendor/packaging/_structures.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_structures.py
index 90a6465f9..225e2eee0 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_structures.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_structures.py
@@ -2,8 +2,13 @@
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
# for complete details.
+import typing
+
+@typing.final
class InfinityType:
+ __slots__ = ()
+
def __repr__(self) -> str:
return "Infinity"
@@ -32,7 +37,10 @@ def __neg__(self: object) -> "NegativeInfinityType":
Infinity = InfinityType()
+@typing.final
class NegativeInfinityType:
+ __slots__ = ()
+
def __repr__(self) -> str:
return "-Infinity"
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_tokenizer.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_tokenizer.py
index 89d041605..e6d20dd3f 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/_tokenizer.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/_tokenizer.py
@@ -3,7 +3,7 @@
import contextlib
import re
from dataclasses import dataclass
-from typing import Iterator, NoReturn
+from typing import Generator, Mapping, NoReturn
from .specifiers import Specifier
@@ -33,16 +33,16 @@ def __init__(
def __str__(self) -> str:
marker = " " * self.span[0] + "~" * (self.span[1] - self.span[0]) + "^"
- return "\n ".join([self.message, self.source, marker])
+ return f"{self.message}\n {self.source}\n {marker}"
-DEFAULT_RULES: dict[str, str | re.Pattern[str]] = {
- "LEFT_PARENTHESIS": r"\(",
- "RIGHT_PARENTHESIS": r"\)",
- "LEFT_BRACKET": r"\[",
- "RIGHT_BRACKET": r"\]",
- "SEMICOLON": r";",
- "COMMA": r",",
+DEFAULT_RULES: dict[str, re.Pattern[str]] = {
+ "LEFT_PARENTHESIS": re.compile(r"\("),
+ "RIGHT_PARENTHESIS": re.compile(r"\)"),
+ "LEFT_BRACKET": re.compile(r"\["),
+ "RIGHT_BRACKET": re.compile(r"\]"),
+ "SEMICOLON": re.compile(r";"),
+ "COMMA": re.compile(r","),
"QUOTED_STRING": re.compile(
r"""
(
@@ -53,10 +53,10 @@ def __str__(self) -> str:
""",
re.VERBOSE,
),
- "OP": r"(===|==|~=|!=|<=|>=|<|>)",
- "BOOLOP": r"\b(or|and)\b",
- "IN": r"\bin\b",
- "NOT": r"\bnot\b",
+ "OP": re.compile(r"(===|==|~=|!=|<=|>=|<|>)"),
+ "BOOLOP": re.compile(r"\b(or|and)\b"),
+ "IN": re.compile(r"\bin\b"),
+ "NOT": re.compile(r"\bnot\b"),
"VARIABLE": re.compile(
r"""
\b(
@@ -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,
@@ -77,13 +78,13 @@ def __str__(self) -> str:
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"$",
+ "AT": re.compile(r"\@"),
+ "URL": re.compile(r"[^ \t]+"),
+ "IDENTIFIER": re.compile(r"\b[a-zA-Z0-9][a-zA-Z0-9._-]*\b"),
+ "VERSION_PREFIX_TRAIL": re.compile(r"\.\*"),
+ "VERSION_LOCAL_LABEL_TRAIL": re.compile(r"\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*"),
+ "WS": re.compile(r"[ \t]+"),
+ "END": re.compile(r"$"),
}
@@ -98,12 +99,10 @@ def __init__(
self,
source: str,
*,
- rules: dict[str, str | re.Pattern[str]],
+ rules: Mapping[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.rules = rules
self.next_token: Token | None = None
self.position = 0
@@ -119,9 +118,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]
@@ -173,7 +172,7 @@ def raise_syntax_error(
@contextlib.contextmanager
def enclosing_tokens(
self, open_token: str, close_token: str, *, around: str
- ) -> Iterator[None]:
+ ) -> Generator[None, None, None]:
if self.check(open_token):
open_position = self.position
self.read()
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/__init__.py
index 71a1a7794..335b275fa 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/__init__.py
@@ -34,11 +34,11 @@
import re
from typing import NewType, cast
-from pip._vendor.packaging.licenses._spdx import EXCEPTIONS, LICENSES
+from ._spdx import EXCEPTIONS, LICENSES
__all__ = [
- "NormalizedLicenseExpression",
"InvalidLicenseExpression",
+ "NormalizedLicenseExpression",
"canonicalize_license_expression",
]
@@ -80,16 +80,21 @@ def canonicalize_license_expression(
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.
+ # Rather than implementing a parenthesis/boolean logic parser, create an
+ # expression that Python can parse. Everything that is not involved with the
+ # grammar itself is replaced with the placeholder `False` and the resultant
+ # expression should become a valid Python expression.
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"}:
+ elif (
+ token == "("
+ and python_tokens
+ and python_tokens[-1] not in {"or", "and", "("}
+ ) or (token == ")" and python_tokens and python_tokens[-1] == "("):
message = f"Invalid license expression: {raw_license_expression!r}"
raise InvalidLicenseExpression(message)
else:
@@ -97,11 +102,8 @@ def canonicalize_license_expression(
python_expression = " ".join(python_tokens)
try:
- invalid = eval(python_expression, globals(), locals())
- except Exception:
- invalid = True
-
- if invalid is not False:
+ compile(python_expression, "", "eval")
+ except SyntaxError:
message = f"Invalid license expression: {raw_license_expression!r}"
raise InvalidLicenseExpression(message) from None
@@ -140,6 +142,6 @@ def canonicalize_license_expression(
normalized_expression = " ".join(normalized_tokens)
return cast(
- NormalizedLicenseExpression,
+ "NormalizedLicenseExpression",
normalized_expression.replace("( ", "(").replace(" )", ")"),
)
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/_spdx.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/_spdx.py
index eac22276a..a277af282 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/_spdx.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/licenses/_spdx.py
@@ -12,7 +12,7 @@ class SPDXException(TypedDict):
deprecated: bool
-VERSION = '3.25.0'
+VERSION = '3.27.0'
LICENSES: dict[str, SPDXLicense] = {
'0bsd': {'id': '0BSD', 'deprecated': False},
@@ -46,6 +46,7 @@ class SPDXException(TypedDict):
'antlr-pd': {'id': 'ANTLR-PD', 'deprecated': False},
'antlr-pd-fallback': {'id': 'ANTLR-PD-fallback', 'deprecated': False},
'any-osi': {'id': 'any-OSI', 'deprecated': False},
+ 'any-osi-perl-modules': {'id': 'any-OSI-perl-modules', '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},
@@ -61,6 +62,8 @@ class SPDXException(TypedDict):
'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},
+ 'artistic-dist': {'id': 'Artistic-dist', 'deprecated': False},
+ 'aspell-ru': {'id': 'Aspell-RU', '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},
@@ -75,6 +78,7 @@ class SPDXException(TypedDict):
'blessing': {'id': 'blessing', 'deprecated': False},
'blueoak-1.0.0': {'id': 'BlueOak-1.0.0', 'deprecated': False},
'boehm-gc': {'id': 'Boehm-GC', 'deprecated': False},
+ 'boehm-gc-without-fee': {'id': 'Boehm-GC-without-fee', '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},
@@ -85,6 +89,7 @@ class SPDXException(TypedDict):
'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-pkgconf-disclaimer': {'id': 'BSD-2-Clause-pkgconf-disclaimer', '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},
@@ -176,6 +181,8 @@ class SPDXException(TypedDict):
'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},
+ 'cc-pdm-1.0': {'id': 'CC-PDM-1.0', 'deprecated': False},
+ 'cc-sa-1.0': {'id': 'CC-SA-1.0', '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},
@@ -215,6 +222,7 @@ class SPDXException(TypedDict):
'cpol-1.02': {'id': 'CPOL-1.02', 'deprecated': False},
'cronyx': {'id': 'Cronyx', 'deprecated': False},
'crossword': {'id': 'Crossword', 'deprecated': False},
+ 'cryptoswift': {'id': 'CryptoSwift', 'deprecated': False},
'crystalstacker': {'id': 'CrystalStacker', 'deprecated': False},
'cua-opl-1.0': {'id': 'CUA-OPL-1.0', 'deprecated': False},
'cube': {'id': 'Cube', 'deprecated': False},
@@ -226,7 +234,9 @@ class SPDXException(TypedDict):
'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-dtd': {'id': 'DocBook-DTD', 'deprecated': False},
'docbook-schema': {'id': 'DocBook-Schema', 'deprecated': False},
+ 'docbook-stylesheet': {'id': 'DocBook-Stylesheet', 'deprecated': False},
'docbook-xml': {'id': 'DocBook-XML', 'deprecated': False},
'dotseqn': {'id': 'Dotseqn', 'deprecated': False},
'drl-1.0': {'id': 'DRL-1.0', 'deprecated': False},
@@ -263,12 +273,17 @@ class SPDXException(TypedDict):
'fsfap-no-warranty-disclaimer': {'id': 'FSFAP-no-warranty-disclaimer', 'deprecated': False},
'fsful': {'id': 'FSFUL', 'deprecated': False},
'fsfullr': {'id': 'FSFULLR', 'deprecated': False},
+ 'fsfullrsd': {'id': 'FSFULLRSD', 'deprecated': False},
'fsfullrwd': {'id': 'FSFULLRWD', 'deprecated': False},
+ 'fsl-1.1-alv2': {'id': 'FSL-1.1-ALv2', 'deprecated': False},
+ 'fsl-1.1-mit': {'id': 'FSL-1.1-MIT', 'deprecated': False},
'ftl': {'id': 'FTL', 'deprecated': False},
'furuseth': {'id': 'Furuseth', 'deprecated': False},
'fwlw': {'id': 'fwlw', 'deprecated': False},
+ 'game-programming-gems': {'id': 'Game-Programming-Gems', 'deprecated': False},
'gcr-docs': {'id': 'GCR-docs', 'deprecated': False},
'gd': {'id': 'GD', 'deprecated': False},
+ 'generic-xts': {'id': 'generic-xts', '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},
@@ -320,6 +335,7 @@ class SPDXException(TypedDict):
'gtkbook': {'id': 'gtkbook', 'deprecated': False},
'gutmann': {'id': 'Gutmann', 'deprecated': False},
'haskellreport': {'id': 'HaskellReport', 'deprecated': False},
+ 'hdf5': {'id': 'HDF5', 'deprecated': False},
'hdparm': {'id': 'hdparm', 'deprecated': False},
'hidapi': {'id': 'HIDAPI', 'deprecated': False},
'hippocratic-2.1': {'id': 'Hippocratic-2.1', 'deprecated': False},
@@ -360,6 +376,7 @@ class SPDXException(TypedDict):
'imlib2': {'id': 'Imlib2', 'deprecated': False},
'info-zip': {'id': 'Info-ZIP', 'deprecated': False},
'inner-net-2.0': {'id': 'Inner-Net-2.0', 'deprecated': False},
+ 'innosetup': {'id': 'InnoSetup', 'deprecated': False},
'intel': {'id': 'Intel', 'deprecated': False},
'intel-acpi': {'id': 'Intel-ACPI', 'deprecated': False},
'interbase-1.0': {'id': 'Interbase-1.0', 'deprecated': False},
@@ -369,6 +386,7 @@ class SPDXException(TypedDict):
'isc-veillard': {'id': 'ISC-Veillard', 'deprecated': False},
'jam': {'id': 'Jam', 'deprecated': False},
'jasper-2.0': {'id': 'JasPer-2.0', 'deprecated': False},
+ 'jove': {'id': 'jove', 'deprecated': False},
'jpl-image': {'id': 'JPL-image', 'deprecated': False},
'jpnic': {'id': 'JPNIC', 'deprecated': False},
'json': {'id': 'JSON', 'deprecated': False},
@@ -394,6 +412,7 @@ class SPDXException(TypedDict):
'lgpl-3.0-or-later': {'id': 'LGPL-3.0-or-later', 'deprecated': False},
'lgpllr': {'id': 'LGPLLR', 'deprecated': False},
'libpng': {'id': 'Libpng', 'deprecated': False},
+ 'libpng-1.6.35': {'id': 'libpng-1.6.35', '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},
@@ -424,14 +443,17 @@ class SPDXException(TypedDict):
'magaz': {'id': 'magaz', 'deprecated': False},
'mailprio': {'id': 'mailprio', 'deprecated': False},
'makeindex': {'id': 'MakeIndex', 'deprecated': False},
+ 'man2html': {'id': 'man2html', '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},
+ 'mips': {'id': 'MIPS', '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-click': {'id': 'MIT-Click', 'deprecated': False},
'mit-cmu': {'id': 'MIT-CMU', 'deprecated': False},
'mit-enna': {'id': 'MIT-enna', 'deprecated': False},
'mit-feh': {'id': 'MIT-feh', 'deprecated': False},
@@ -472,6 +494,7 @@ class SPDXException(TypedDict):
'netcdf': {'id': 'NetCDF', 'deprecated': False},
'newsletr': {'id': 'Newsletr', 'deprecated': False},
'ngpl': {'id': 'NGPL', 'deprecated': False},
+ 'ngrep': {'id': 'ngrep', '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},
@@ -486,6 +509,7 @@ class SPDXException(TypedDict):
'npl-1.1': {'id': 'NPL-1.1', 'deprecated': False},
'nposl-3.0': {'id': 'NPOSL-3.0', 'deprecated': False},
'nrl': {'id': 'NRL', 'deprecated': False},
+ 'ntia-pd': {'id': 'NTIA-PD', 'deprecated': False},
'ntp': {'id': 'NTP', 'deprecated': False},
'ntp-0': {'id': 'NTP-0', 'deprecated': False},
'nunit': {'id': 'Nunit', 'deprecated': True},
@@ -580,6 +604,7 @@ class SPDXException(TypedDict):
'schemereport': {'id': 'SchemeReport', 'deprecated': False},
'sendmail': {'id': 'Sendmail', 'deprecated': False},
'sendmail-8.23': {'id': 'Sendmail-8.23', 'deprecated': False},
+ 'sendmail-open-source-1.1': {'id': 'Sendmail-Open-Source-1.1', '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},
@@ -592,10 +617,12 @@ class SPDXException(TypedDict):
'sissl-1.2': {'id': 'SISSL-1.2', 'deprecated': False},
'sl': {'id': 'SL', 'deprecated': False},
'sleepycat': {'id': 'Sleepycat', 'deprecated': False},
+ 'smail-gpl': {'id': 'SMAIL-GPL', 'deprecated': False},
'smlnj': {'id': 'SMLNJ', 'deprecated': False},
'smppl': {'id': 'SMPPL', 'deprecated': False},
'snia': {'id': 'SNIA', 'deprecated': False},
'snprintf': {'id': 'snprintf', 'deprecated': False},
+ 'sofa': {'id': 'SOFA', 'deprecated': False},
'softsurfer': {'id': 'softSurfer', 'deprecated': False},
'soundex': {'id': 'Soundex', 'deprecated': False},
'spencer-86': {'id': 'Spencer-86', 'deprecated': False},
@@ -609,6 +636,7 @@ class SPDXException(TypedDict):
'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},
+ 'sul-1.0': {'id': 'SUL-1.0', 'deprecated': False},
'sun-ppp': {'id': 'Sun-PPP', 'deprecated': False},
'sun-ppp-2000': {'id': 'Sun-PPP-2000', 'deprecated': False},
'sunpro': {'id': 'SunPro', 'deprecated': False},
@@ -620,12 +648,14 @@ class SPDXException(TypedDict):
'tcp-wrappers': {'id': 'TCP-wrappers', 'deprecated': False},
'termreadkey': {'id': 'TermReadKey', 'deprecated': False},
'tgppl-1.0': {'id': 'TGPPL-1.0', 'deprecated': False},
+ 'thirdeye': {'id': 'ThirdEye', '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},
+ 'trustedqsl': {'id': 'TrustedQSL', 'deprecated': False},
'ttwl': {'id': 'TTWL', 'deprecated': False},
'ttyp0': {'id': 'TTYP0', 'deprecated': False},
'tu-berlin-1.0': {'id': 'TU-Berlin-1.0', 'deprecated': False},
@@ -641,6 +671,8 @@ class SPDXException(TypedDict):
'unicode-tou': {'id': 'Unicode-TOU', 'deprecated': False},
'unixcrypt': {'id': 'UnixCrypt', 'deprecated': False},
'unlicense': {'id': 'Unlicense', 'deprecated': False},
+ 'unlicense-libtelnet': {'id': 'Unlicense-libtelnet', 'deprecated': False},
+ 'unlicense-libwhirlpool': {'id': 'Unlicense-libwhirlpool', 'deprecated': False},
'upl-1.0': {'id': 'UPL-1.0', 'deprecated': False},
'urt-rle': {'id': 'URT-RLE', 'deprecated': False},
'vim': {'id': 'Vim', 'deprecated': False},
@@ -654,6 +686,7 @@ class SPDXException(TypedDict):
'widget-workshop': {'id': 'Widget-Workshop', 'deprecated': False},
'wsuipa': {'id': 'Wsuipa', 'deprecated': False},
'wtfpl': {'id': 'WTFPL', 'deprecated': False},
+ 'wwl': {'id': 'wwl', 'deprecated': False},
'wxwindows': {'id': 'wxWindows', 'deprecated': True},
'x11': {'id': 'X11', 'deprecated': False},
'x11-distribute-modifications-variant': {'id': 'X11-distribute-modifications-variant', 'deprecated': False},
@@ -695,9 +728,11 @@ class SPDXException(TypedDict):
'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},
+ 'cgal-linking-exception': {'id': 'CGAL-linking-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},
+ 'digia-qt-lgpl-exception-1.1': {'id': 'Digia-Qt-LGPL-exception-1.1', '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},
@@ -714,13 +749,16 @@ class SPDXException(TypedDict):
'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-389-ds-base-exception': {'id': 'GPL-3.0-389-ds-base-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},
+ 'harbour-exception': {'id': 'harbour-exception', 'deprecated': False},
'i2p-gpl-java-exception': {'id': 'i2p-gpl-java-exception', 'deprecated': False},
+ 'independent-modules-exception': {'id': 'Independent-modules-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},
@@ -730,12 +768,14 @@ class SPDXException(TypedDict):
'llvm-exception': {'id': 'LLVM-exception', 'deprecated': False},
'lzma-exception': {'id': 'LZMA-exception', 'deprecated': False},
'mif-exception': {'id': 'mif-exception', 'deprecated': False},
+ 'mxml-exception': {'id': 'mxml-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},
+ 'polyparse-exception': {'id': 'polyparse-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},
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/markers.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/markers.py
index fb7f49cf8..ca3706fe4 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/markers.py
+++ b/addons/source-python/packages/site-packages/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, Callable, Literal, Mapping, TypedDict, Union, cast
from ._parser import MarkerAtom, MarkerList, Op, Value, Variable
from ._parser import parse_marker as _parse_marker
@@ -17,6 +17,8 @@
from .utils import canonicalize_name
__all__ = [
+ "Environment",
+ "EvaluateContext",
"InvalidMarker",
"Marker",
"UndefinedComparison",
@@ -24,7 +26,15 @@
"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"}
+MARKERS_REQUIRING_VERSION = {
+ "implementation_version",
+ "platform_release",
+ "python_full_version",
+ "python_version",
+}
class InvalidMarker(ValueError):
@@ -118,20 +128,28 @@ class Environment(TypedDict):
"""
-def _normalize_extra_values(results: Any) -> Any:
+def _normalize_extras(
+ result: MarkerList | MarkerAtom | str,
+) -> MarkerList | MarkerAtom | str:
+ if not isinstance(result, tuple):
+ return result
+
+ lhs, op, rhs = result
+ 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)
+ return lhs, op, rhs
+
+
+def _normalize_extra_values(results: MarkerList) -> MarkerList:
"""
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
+
+ return [_normalize_extras(r) for r in results]
def _format_marker(
@@ -165,48 +183,59 @@ def _format_marker(
_operators: dict[str, Operator] = {
"in": lambda lhs, rhs: lhs in rhs,
"not in": lambda lhs, rhs: lhs not in rhs,
- "<": operator.lt,
- "<=": operator.le,
+ "<": lambda _lhs, _rhs: False,
+ "<=": operator.eq,
"==": operator.eq,
"!=": operator.ne,
- ">=": operator.ge,
- ">": operator.gt,
+ ">=": operator.eq,
+ ">": lambda _lhs, _rhs: False,
}
-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], *, key: str) -> bool:
+ op_str = op.serialize()
+ if key in MARKERS_REQUIRING_VERSION:
+ try:
+ spec = Specifier(f"{op_str}{rhs}")
+ except InvalidSpecifier:
+ pass
+ else:
+ return spec.contains(lhs, prereleases=True)
- oper: Operator | None = _operators.get(op.serialize())
+ oper: Operator | None = _operators.get(op_str)
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, ...]:
- # PEP 685 – Comparison of extra names for optional distribution dependencies
+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"
+ # Both sides are normalized at this point already
+ return (lhs, 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:
- assert isinstance(marker, (list, tuple, str))
-
if isinstance(marker, list):
groups[-1].append(_evaluate_markers(marker, environment))
elif isinstance(marker, tuple):
@@ -221,12 +250,15 @@ def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool:
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:
- assert marker in ["and", "or"]
- if marker == "or":
- groups.append([])
+ groups[-1].append(_eval_op(lhs_value, op, rhs_value, key=environment_key))
+ elif marker == "or":
+ groups.append([])
+ elif marker == "and":
+ pass
+ else: # pragma: nocover
+ raise TypeError(f"Unexpected marker {marker!r}")
return any(all(item) for item in groups)
@@ -262,6 +294,11 @@ 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.
+
+ # If this fails and throws an error, the repr still expects _markers to
+ # be defined.
+ self._markers: MarkerList = []
+
try:
self._markers = _normalize_extra_values(_parse_marker(marker))
# The attribute `_markers` can be described in terms of a recursive type:
@@ -287,45 +324,65 @@ def __str__(self) -> str:
return _format_marker(self._markers)
def __repr__(self) -> str:
- return f""
+ return f"<{self.__class__.__name__}('{self}')>"
def __hash__(self) -> int:
- return hash((self.__class__.__name__, str(self)))
+ return hash(str(self))
- def __eq__(self, other: Any) -> bool:
+ def __eq__(self, other: object) -> bool:
if not isinstance(other, Marker):
return NotImplemented
return str(self) == str(other)
- def evaluate(self, environment: dict[str, str] | None = None) -> bool:
+ def evaluate(
+ self,
+ environment: Mapping[str, str | AbstractSet[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:
- current_environment["extra"] = ""
+ if "extra" in current_environment:
+ # The API used to allow setting extra to None. We need to handle
+ # this case for backwards compatibility. Also skip running
+ # normalize name if extra is empty.
+ extra = cast("str | None", current_environment["extra"])
+ current_environment["extra"] = canonicalize_name(extra) if extra else ""
return _evaluate_markers(
self._markers, _repair_python_full_version(current_environment)
)
-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/addons/source-python/packages/site-packages/pip/_vendor/packaging/metadata.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/metadata.py
index 721f411cf..253f6b1b7 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/metadata.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/metadata.py
@@ -5,6 +5,7 @@
import email.message
import email.parser
import email.policy
+import keyword
import pathlib
import sys
import typing
@@ -19,13 +20,15 @@
from . import licenses, requirements, specifiers, utils
from . import version as version_module
-from .licenses import NormalizedLicenseExpression
+
+if typing.TYPE_CHECKING:
+ from .licenses import NormalizedLicenseExpression
T = typing.TypeVar("T")
if sys.version_info >= (3, 11): # pragma: no cover
- ExceptionGroup = ExceptionGroup
+ ExceptionGroup = ExceptionGroup # noqa: F821
else: # pragma: no cover
class ExceptionGroup(Exception):
@@ -126,13 +129,19 @@ class RawMetadata(TypedDict, total=False):
# Metadata 2.3 - PEP 685
# No new fields were added in PEP 685, just some edge case were
- # tightened up to provide better interoptability.
+ # tightened up to provide better interoperability.
# Metadata 2.4 - PEP 639
license_expression: str
license_files: list[str]
+ # Metadata 2.5 - PEP 794
+ import_names: list[str]
+ import_namespaces: list[str]
+
+# 'keywords' is special as it's a string in the core metadata spec, but we
+# represent it as a list.
_STRING_FIELDS = {
"author",
"author_email",
@@ -165,6 +174,8 @@ class RawMetadata(TypedDict, total=False):
"requires_dist",
"requires_external",
"supported_platforms",
+ "import_names",
+ "import_namespaces",
}
_DICT_FIELDS = {
@@ -193,24 +204,23 @@ def _parse_project_urls(data: list[str]) -> dict[str, str]:
# 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
+ # The other potential 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
+ # thing we can, which is treat the field as unparsable 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
+ label, _, url = (s.strip() for s in pair.partition(","))
+
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.
+ # is unparsable, and we can just add the whole thing to our
+ # unparsable data and stop processing it.
raise KeyError("duplicate labels in project urls")
urls[label] = url
@@ -257,6 +267,8 @@ def _get_payload(msg: email.message.Message, source: bytes | str) -> str:
"download-url": "download_url",
"dynamic": "dynamic",
"home-page": "home_page",
+ "import-name": "import_names",
+ "import-namespace": "import_namespaces",
"keywords": "keywords",
"license": "license",
"license-expression": "license_expression",
@@ -283,6 +295,45 @@ def _get_payload(msg: email.message.Message, source: bytes | str) -> str:
_RAW_TO_EMAIL_MAPPING = {raw: email for email, raw in _EMAIL_TO_RAW_MAPPING.items()}
+# This class is for writing RFC822 messages
+class RFC822Policy(email.policy.EmailPolicy):
+ """
+ This is :class:`email.policy.EmailPolicy`, but with a simple ``header_store_parse``
+ implementation that handles multi-line values, and some nice defaults.
+ """
+
+ utf8 = True
+ mangle_from_ = False
+ max_line_length = 0
+
+ def header_store_parse(self, name: str, value: str) -> tuple[str, str]:
+ size = len(name) + 2
+ value = value.replace("\n", "\n" + " " * size)
+ return (name, value)
+
+
+# This class is for writing RFC822 messages
+class RFC822Message(email.message.EmailMessage):
+ """
+ This is :class:`email.message.EmailMessage` with two small changes: it defaults to
+ our `RFC822Policy`, and it correctly writes unicode when being called
+ with `bytes()`.
+ """
+
+ def __init__(self) -> None:
+ super().__init__(policy=RFC822Policy())
+
+ def as_bytes(
+ self, unixfrom: bool = False, policy: email.policy.Policy | None = None
+ ) -> bytes:
+ """
+ Return the bytes representation of the message.
+
+ This handles unicode encoding.
+ """
+ return self.as_string(unixfrom, policy=policy).encode("utf-8")
+
+
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``).
@@ -310,10 +361,10 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
# 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()):
+ for name_with_case 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()
+ name = name_with_case.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
@@ -349,16 +400,16 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
# can be independently encoded, so we'll need to check each
# of them.
chunks: list[tuple[bytes, str | None]] = []
- for bin, encoding in email.header.decode_header(h):
+ for binary, _encoding in email.header.decode_header(h):
try:
- bin.decode("utf8", "strict")
+ binary.decode("utf8", "strict")
except UnicodeDecodeError:
# Enable mojibake.
encoding = "latin1"
valid_encoding = False
else:
encoding = "utf8"
- chunks.append((bin, encoding))
+ chunks.append((binary, encoding))
# Turn our chunks back into a Header object, then let that
# Header object do the right thing to turn them into a
@@ -397,6 +448,11 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
# of unparsed stuff.
if raw_name in _STRING_FIELDS and len(value) == 1:
raw[raw_name] = value[0]
+ # If this is import_names, we need to special case the empty field
+ # case, which converts to an empty list instead of None. We can't let
+ # the empty case slip through, as it will fail validation.
+ elif raw_name == "import_names" and value == [""]:
+ raw[raw_name] = []
# 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.
@@ -424,7 +480,7 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
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.
+ # throw it in our unparsable data and move on.
else:
unparsed[name] = value
@@ -441,9 +497,9 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
else:
if payload:
# Check to see if we've already got a description, if so then both
- # it, and this body move to unparseable.
+ # it, and this body move to unparsable.
if "description" in raw:
- description_header = cast(str, raw.pop("description"))
+ description_header = cast("str", raw.pop("description"))
unparsed.setdefault("description", []).extend(
[description_header, payload]
)
@@ -456,15 +512,15 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
# 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
+ 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", "2.4"]
-_MetadataVersion = Literal["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4"]
+_VALID_METADATA_VERSIONS = ["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4", "2.5"]
+_MetadataVersion = Literal["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4", "2.5"]
_REQUIRED_ATTRS = frozenset(["metadata_version", "name", "version"])
@@ -519,7 +575,7 @@ def __get__(self, instance: Metadata, _owner: type[Metadata]) -> T:
except KeyError:
pass
- return cast(T, value)
+ return cast("T", value)
def _invalid_metadata(
self, msg: str, cause: Exception | None = None
@@ -534,7 +590,7 @@ 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)
+ return cast("_MetadataVersion", value)
def _process_name(self, value: str) -> str:
if not value:
@@ -647,9 +703,7 @@ def _process_requires_dist(
else:
return reqs
- def _process_license_expression(
- self, value: str
- ) -> NormalizedLicenseExpression | None:
+ def _process_license_expression(self, value: str) -> NormalizedLicenseExpression:
try:
return licenses.canonicalize_license_expression(value)
except ValueError as exc:
@@ -678,12 +732,35 @@ 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
+ def _process_import_names(self, value: list[str]) -> list[str]:
+ for import_name in value:
+ name, semicolon, private = import_name.partition(";")
+ name = name.rstrip()
+ for identifier in name.split("."):
+ if not identifier.isidentifier():
+ raise self._invalid_metadata(
+ f"{name!r} is invalid for {{field}}; "
+ f"{identifier!r} is not a valid identifier"
+ )
+ elif keyword.iskeyword(identifier):
+ raise self._invalid_metadata(
+ f"{name!r} is invalid for {{field}}; "
+ f"{identifier!r} is a keyword"
+ )
+ if semicolon and private.lstrip() != "private":
+ raise self._invalid_metadata(
+ f"{import_name!r} is invalid for {{field}}; "
+ "the only valid option is 'private'"
+ )
+ return value
+
+ _process_import_namespaces = _process_import_names
+
class Metadata:
"""Representation of distribution metadata.
@@ -855,9 +932,47 @@ def from_email(cls, data: bytes | str, *, validate: bool = True) -> Metadata:
""":external:ref:`core-metadata-provides-dist`"""
obsoletes_dist: _Validator[list[str] | None] = _Validator(added="1.2")
""":external:ref:`core-metadata-obsoletes-dist`"""
+ import_names: _Validator[list[str] | None] = _Validator(added="2.5")
+ """:external:ref:`core-metadata-import-name`"""
+ import_namespaces: _Validator[list[str] | None] = _Validator(added="2.5")
+ """:external:ref:`core-metadata-import-namespace`"""
requires: _Validator[list[str] | None] = _Validator(added="1.1")
"""``Requires`` (deprecated)"""
provides: _Validator[list[str] | None] = _Validator(added="1.1")
"""``Provides`` (deprecated)"""
obsoletes: _Validator[list[str] | None] = _Validator(added="1.1")
"""``Obsoletes`` (deprecated)"""
+
+ def as_rfc822(self) -> RFC822Message:
+ """
+ Return an RFC822 message with the metadata.
+ """
+ message = RFC822Message()
+ self._write_metadata(message)
+ return message
+
+ def _write_metadata(self, message: RFC822Message) -> None:
+ """
+ Return an RFC822 message with the metadata.
+ """
+ for name, validator in self.__class__.__dict__.items():
+ if isinstance(validator, _Validator) and name != "description":
+ value = getattr(self, name)
+ email_name = _RAW_TO_EMAIL_MAPPING[name]
+ if value is not None:
+ if email_name == "project-url":
+ for label, url in value.items():
+ message[email_name] = f"{label}, {url}"
+ elif email_name == "keywords":
+ message[email_name] = ",".join(value)
+ elif email_name == "import-name" and value == []:
+ message[email_name] = ""
+ elif isinstance(value, list):
+ for item in value:
+ message[email_name] = str(item)
+ else:
+ message[email_name] = str(value)
+
+ # The description is a special case because it is in the body of the message.
+ if self.description is not None:
+ message.set_payload(self.description)
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/pylock.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/pylock.py
new file mode 100644
index 000000000..a564f1524
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/pylock.py
@@ -0,0 +1,635 @@
+from __future__ import annotations
+
+import dataclasses
+import logging
+import re
+from collections.abc import Mapping, Sequence
+from dataclasses import dataclass
+from datetime import datetime
+from typing import (
+ TYPE_CHECKING,
+ Any,
+ Callable,
+ Protocol,
+ TypeVar,
+)
+
+from .markers import Marker
+from .specifiers import SpecifierSet
+from .utils import NormalizedName, is_normalized_name
+from .version import Version
+
+if TYPE_CHECKING: # pragma: no cover
+ from pathlib import Path
+
+ from typing_extensions import Self
+
+_logger = logging.getLogger(__name__)
+
+__all__ = [
+ "Package",
+ "PackageArchive",
+ "PackageDirectory",
+ "PackageSdist",
+ "PackageVcs",
+ "PackageWheel",
+ "Pylock",
+ "PylockUnsupportedVersionError",
+ "PylockValidationError",
+ "is_valid_pylock_path",
+]
+
+_T = TypeVar("_T")
+_T2 = TypeVar("_T2")
+
+
+class _FromMappingProtocol(Protocol): # pragma: no cover
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self: ...
+
+
+_FromMappingProtocolT = TypeVar("_FromMappingProtocolT", bound=_FromMappingProtocol)
+
+
+_PYLOCK_FILE_NAME_RE = re.compile(r"^pylock\.([^.]+)\.toml$")
+
+
+def is_valid_pylock_path(path: Path) -> bool:
+ """Check if the given path is a valid pylock file path."""
+ return path.name == "pylock.toml" or bool(_PYLOCK_FILE_NAME_RE.match(path.name))
+
+
+def _toml_key(key: str) -> str:
+ return key.replace("_", "-")
+
+
+def _toml_value(key: str, value: Any) -> Any: # noqa: ANN401
+ if isinstance(value, (Version, Marker, SpecifierSet)):
+ return str(value)
+ if isinstance(value, Sequence) and key == "environments":
+ return [str(v) for v in value]
+ return value
+
+
+def _toml_dict_factory(data: list[tuple[str, Any]]) -> dict[str, Any]:
+ return {
+ _toml_key(key): _toml_value(key, value)
+ for key, value in data
+ if value is not None
+ }
+
+
+def _get(d: Mapping[str, Any], expected_type: type[_T], key: str) -> _T | None:
+ """Get a value from the dictionary and verify it's the expected type."""
+ if (value := d.get(key)) is None:
+ return None
+ if not isinstance(value, expected_type):
+ raise PylockValidationError(
+ f"Unexpected type {type(value).__name__} "
+ f"(expected {expected_type.__name__})",
+ context=key,
+ )
+ return value
+
+
+def _get_required(d: Mapping[str, Any], expected_type: type[_T], key: str) -> _T:
+ """Get a required value from the dictionary and verify it's the expected type."""
+ if (value := _get(d, expected_type, key)) is None:
+ raise _PylockRequiredKeyError(key)
+ return value
+
+
+def _get_sequence(
+ d: Mapping[str, Any], expected_item_type: type[_T], key: str
+) -> Sequence[_T] | None:
+ """Get a list value from the dictionary and verify it's the expected items type."""
+ if (value := _get(d, Sequence, key)) is None: # type: ignore[type-abstract]
+ return None
+ if isinstance(value, (str, bytes)):
+ # special case: str and bytes are Sequences, but we want to reject it
+ raise PylockValidationError(
+ f"Unexpected type {type(value).__name__} (expected Sequence)",
+ context=key,
+ )
+ for i, item in enumerate(value):
+ if not isinstance(item, expected_item_type):
+ raise PylockValidationError(
+ f"Unexpected type {type(item).__name__} "
+ f"(expected {expected_item_type.__name__})",
+ context=f"{key}[{i}]",
+ )
+ return value
+
+
+def _get_as(
+ d: Mapping[str, Any],
+ expected_type: type[_T],
+ target_type: Callable[[_T], _T2],
+ key: str,
+) -> _T2 | None:
+ """Get a value from the dictionary, verify it's the expected type,
+ and convert to the target type.
+
+ This assumes the target_type constructor accepts the value.
+ """
+ if (value := _get(d, expected_type, key)) is None:
+ return None
+ try:
+ return target_type(value)
+ except Exception as e:
+ raise PylockValidationError(e, context=key) from e
+
+
+def _get_required_as(
+ d: Mapping[str, Any],
+ expected_type: type[_T],
+ target_type: Callable[[_T], _T2],
+ key: str,
+) -> _T2:
+ """Get a required value from the dict, verify it's the expected type,
+ and convert to the target type."""
+ if (value := _get_as(d, expected_type, target_type, key)) is None:
+ raise _PylockRequiredKeyError(key)
+ return value
+
+
+def _get_sequence_as(
+ d: Mapping[str, Any],
+ expected_item_type: type[_T],
+ target_item_type: Callable[[_T], _T2],
+ key: str,
+) -> list[_T2] | None:
+ """Get list value from dictionary and verify expected items type."""
+ if (value := _get_sequence(d, expected_item_type, key)) is None:
+ return None
+ result = []
+ try:
+ for item in value:
+ typed_item = target_item_type(item)
+ result.append(typed_item)
+ except Exception as e:
+ raise PylockValidationError(e, context=f"{key}[{len(result)}]") from e
+ return result
+
+
+def _get_object(
+ d: Mapping[str, Any], target_type: type[_FromMappingProtocolT], key: str
+) -> _FromMappingProtocolT | None:
+ """Get a dictionary value from the dictionary and convert it to a dataclass."""
+ if (value := _get(d, Mapping, key)) is None: # type: ignore[type-abstract]
+ return None
+ try:
+ return target_type._from_dict(value)
+ except Exception as e:
+ raise PylockValidationError(e, context=key) from e
+
+
+def _get_sequence_of_objects(
+ d: Mapping[str, Any], target_item_type: type[_FromMappingProtocolT], key: str
+) -> list[_FromMappingProtocolT] | None:
+ """Get a list value from the dictionary and convert its items to a dataclass."""
+ if (value := _get_sequence(d, Mapping, key)) is None: # type: ignore[type-abstract]
+ return None
+ result: list[_FromMappingProtocolT] = []
+ try:
+ for item in value:
+ typed_item = target_item_type._from_dict(item)
+ result.append(typed_item)
+ except Exception as e:
+ raise PylockValidationError(e, context=f"{key}[{len(result)}]") from e
+ return result
+
+
+def _get_required_sequence_of_objects(
+ d: Mapping[str, Any], target_item_type: type[_FromMappingProtocolT], key: str
+) -> Sequence[_FromMappingProtocolT]:
+ """Get a required list value from the dictionary and convert its items to a
+ dataclass."""
+ if (result := _get_sequence_of_objects(d, target_item_type, key)) is None:
+ raise _PylockRequiredKeyError(key)
+ return result
+
+
+def _validate_normalized_name(name: str) -> NormalizedName:
+ """Validate that a string is a NormalizedName."""
+ if not is_normalized_name(name):
+ raise PylockValidationError(f"Name {name!r} is not normalized")
+ return NormalizedName(name)
+
+
+def _validate_path_url(path: str | None, url: str | None) -> None:
+ if not path and not url:
+ raise PylockValidationError("path or url must be provided")
+
+
+def _validate_hashes(hashes: Mapping[str, Any]) -> Mapping[str, Any]:
+ if not hashes:
+ raise PylockValidationError("At least one hash must be provided")
+ if not all(isinstance(hash_val, str) for hash_val in hashes.values()):
+ raise PylockValidationError("Hash values must be strings")
+ return hashes
+
+
+class PylockValidationError(Exception):
+ """Raised when when input data is not spec-compliant."""
+
+ context: str | None = None
+ message: str
+
+ def __init__(
+ self,
+ cause: str | Exception,
+ *,
+ context: str | None = None,
+ ) -> None:
+ if isinstance(cause, PylockValidationError):
+ if cause.context:
+ self.context = (
+ f"{context}.{cause.context}" if context else cause.context
+ )
+ else:
+ self.context = context
+ self.message = cause.message
+ else:
+ self.context = context
+ self.message = str(cause)
+
+ def __str__(self) -> str:
+ if self.context:
+ return f"{self.message} in {self.context!r}"
+ return self.message
+
+
+class _PylockRequiredKeyError(PylockValidationError):
+ def __init__(self, key: str) -> None:
+ super().__init__("Missing required value", context=key)
+
+
+class PylockUnsupportedVersionError(PylockValidationError):
+ """Raised when encountering an unsupported `lock_version`."""
+
+
+@dataclass(frozen=True, init=False)
+class PackageVcs:
+ type: str
+ url: str | None = None
+ path: str | None = None
+ requested_revision: str | None = None
+ commit_id: str # type: ignore[misc]
+ subdirectory: str | None = None
+
+ def __init__(
+ self,
+ *,
+ type: str,
+ url: str | None = None,
+ path: str | None = None,
+ requested_revision: str | None = None,
+ commit_id: str,
+ subdirectory: str | None = None,
+ ) -> None:
+ # In Python 3.10+ make dataclass kw_only=True and remove __init__
+ object.__setattr__(self, "type", type)
+ object.__setattr__(self, "url", url)
+ object.__setattr__(self, "path", path)
+ object.__setattr__(self, "requested_revision", requested_revision)
+ object.__setattr__(self, "commit_id", commit_id)
+ object.__setattr__(self, "subdirectory", subdirectory)
+
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
+ package_vcs = cls(
+ type=_get_required(d, str, "type"),
+ url=_get(d, str, "url"),
+ path=_get(d, str, "path"),
+ requested_revision=_get(d, str, "requested-revision"),
+ commit_id=_get_required(d, str, "commit-id"),
+ subdirectory=_get(d, str, "subdirectory"),
+ )
+ _validate_path_url(package_vcs.path, package_vcs.url)
+ return package_vcs
+
+
+@dataclass(frozen=True, init=False)
+class PackageDirectory:
+ path: str
+ editable: bool | None = None
+ subdirectory: str | None = None
+
+ def __init__(
+ self,
+ *,
+ path: str,
+ editable: bool | None = None,
+ subdirectory: str | None = None,
+ ) -> None:
+ # In Python 3.10+ make dataclass kw_only=True and remove __init__
+ object.__setattr__(self, "path", path)
+ object.__setattr__(self, "editable", editable)
+ object.__setattr__(self, "subdirectory", subdirectory)
+
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
+ return cls(
+ path=_get_required(d, str, "path"),
+ editable=_get(d, bool, "editable"),
+ subdirectory=_get(d, str, "subdirectory"),
+ )
+
+
+@dataclass(frozen=True, init=False)
+class PackageArchive:
+ url: str | None = None
+ path: str | None = None
+ size: int | None = None
+ upload_time: datetime | None = None
+ hashes: Mapping[str, str] # type: ignore[misc]
+ subdirectory: str | None = None
+
+ def __init__(
+ self,
+ *,
+ url: str | None = None,
+ path: str | None = None,
+ size: int | None = None,
+ upload_time: datetime | None = None,
+ hashes: Mapping[str, str],
+ subdirectory: str | None = None,
+ ) -> None:
+ # In Python 3.10+ make dataclass kw_only=True and remove __init__
+ object.__setattr__(self, "url", url)
+ object.__setattr__(self, "path", path)
+ object.__setattr__(self, "size", size)
+ object.__setattr__(self, "upload_time", upload_time)
+ object.__setattr__(self, "hashes", hashes)
+ object.__setattr__(self, "subdirectory", subdirectory)
+
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
+ package_archive = cls(
+ url=_get(d, str, "url"),
+ path=_get(d, str, "path"),
+ size=_get(d, int, "size"),
+ upload_time=_get(d, datetime, "upload-time"),
+ hashes=_get_required_as(d, Mapping, _validate_hashes, "hashes"), # type: ignore[type-abstract]
+ subdirectory=_get(d, str, "subdirectory"),
+ )
+ _validate_path_url(package_archive.path, package_archive.url)
+ return package_archive
+
+
+@dataclass(frozen=True, init=False)
+class PackageSdist:
+ name: str | None = None
+ upload_time: datetime | None = None
+ url: str | None = None
+ path: str | None = None
+ size: int | None = None
+ hashes: Mapping[str, str] # type: ignore[misc]
+
+ def __init__(
+ self,
+ *,
+ name: str | None = None,
+ upload_time: datetime | None = None,
+ url: str | None = None,
+ path: str | None = None,
+ size: int | None = None,
+ hashes: Mapping[str, str],
+ ) -> None:
+ # In Python 3.10+ make dataclass kw_only=True and remove __init__
+ object.__setattr__(self, "name", name)
+ object.__setattr__(self, "upload_time", upload_time)
+ object.__setattr__(self, "url", url)
+ object.__setattr__(self, "path", path)
+ object.__setattr__(self, "size", size)
+ object.__setattr__(self, "hashes", hashes)
+
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
+ package_sdist = cls(
+ name=_get(d, str, "name"),
+ upload_time=_get(d, datetime, "upload-time"),
+ url=_get(d, str, "url"),
+ path=_get(d, str, "path"),
+ size=_get(d, int, "size"),
+ hashes=_get_required_as(d, Mapping, _validate_hashes, "hashes"), # type: ignore[type-abstract]
+ )
+ _validate_path_url(package_sdist.path, package_sdist.url)
+ return package_sdist
+
+
+@dataclass(frozen=True, init=False)
+class PackageWheel:
+ name: str | None = None
+ upload_time: datetime | None = None
+ url: str | None = None
+ path: str | None = None
+ size: int | None = None
+ hashes: Mapping[str, str] # type: ignore[misc]
+
+ def __init__(
+ self,
+ *,
+ name: str | None = None,
+ upload_time: datetime | None = None,
+ url: str | None = None,
+ path: str | None = None,
+ size: int | None = None,
+ hashes: Mapping[str, str],
+ ) -> None:
+ # In Python 3.10+ make dataclass kw_only=True and remove __init__
+ object.__setattr__(self, "name", name)
+ object.__setattr__(self, "upload_time", upload_time)
+ object.__setattr__(self, "url", url)
+ object.__setattr__(self, "path", path)
+ object.__setattr__(self, "size", size)
+ object.__setattr__(self, "hashes", hashes)
+
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
+ package_wheel = cls(
+ name=_get(d, str, "name"),
+ upload_time=_get(d, datetime, "upload-time"),
+ url=_get(d, str, "url"),
+ path=_get(d, str, "path"),
+ size=_get(d, int, "size"),
+ hashes=_get_required_as(d, Mapping, _validate_hashes, "hashes"), # type: ignore[type-abstract]
+ )
+ _validate_path_url(package_wheel.path, package_wheel.url)
+ return package_wheel
+
+
+@dataclass(frozen=True, init=False)
+class Package:
+ name: NormalizedName
+ version: Version | None = None
+ marker: Marker | None = None
+ requires_python: SpecifierSet | None = None
+ dependencies: Sequence[Mapping[str, Any]] | None = None
+ vcs: PackageVcs | None = None
+ directory: PackageDirectory | None = None
+ archive: PackageArchive | None = None
+ index: str | None = None
+ sdist: PackageSdist | None = None
+ wheels: Sequence[PackageWheel] | None = None
+ attestation_identities: Sequence[Mapping[str, Any]] | None = None
+ tool: Mapping[str, Any] | None = None
+
+ def __init__(
+ self,
+ *,
+ name: NormalizedName,
+ version: Version | None = None,
+ marker: Marker | None = None,
+ requires_python: SpecifierSet | None = None,
+ dependencies: Sequence[Mapping[str, Any]] | None = None,
+ vcs: PackageVcs | None = None,
+ directory: PackageDirectory | None = None,
+ archive: PackageArchive | None = None,
+ index: str | None = None,
+ sdist: PackageSdist | None = None,
+ wheels: Sequence[PackageWheel] | None = None,
+ attestation_identities: Sequence[Mapping[str, Any]] | None = None,
+ tool: Mapping[str, Any] | None = None,
+ ) -> None:
+ # In Python 3.10+ make dataclass kw_only=True and remove __init__
+ object.__setattr__(self, "name", name)
+ object.__setattr__(self, "version", version)
+ object.__setattr__(self, "marker", marker)
+ object.__setattr__(self, "requires_python", requires_python)
+ object.__setattr__(self, "dependencies", dependencies)
+ object.__setattr__(self, "vcs", vcs)
+ object.__setattr__(self, "directory", directory)
+ object.__setattr__(self, "archive", archive)
+ object.__setattr__(self, "index", index)
+ object.__setattr__(self, "sdist", sdist)
+ object.__setattr__(self, "wheels", wheels)
+ object.__setattr__(self, "attestation_identities", attestation_identities)
+ object.__setattr__(self, "tool", tool)
+
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
+ package = cls(
+ name=_get_required_as(d, str, _validate_normalized_name, "name"),
+ version=_get_as(d, str, Version, "version"),
+ requires_python=_get_as(d, str, SpecifierSet, "requires-python"),
+ dependencies=_get_sequence(d, Mapping, "dependencies"), # type: ignore[type-abstract]
+ marker=_get_as(d, str, Marker, "marker"),
+ vcs=_get_object(d, PackageVcs, "vcs"),
+ directory=_get_object(d, PackageDirectory, "directory"),
+ archive=_get_object(d, PackageArchive, "archive"),
+ index=_get(d, str, "index"),
+ sdist=_get_object(d, PackageSdist, "sdist"),
+ wheels=_get_sequence_of_objects(d, PackageWheel, "wheels"),
+ attestation_identities=_get_sequence(d, Mapping, "attestation-identities"), # type: ignore[type-abstract]
+ tool=_get(d, Mapping, "tool"), # type: ignore[type-abstract]
+ )
+ distributions = bool(package.sdist) + len(package.wheels or [])
+ direct_urls = (
+ bool(package.vcs) + bool(package.directory) + bool(package.archive)
+ )
+ if distributions > 0 and direct_urls > 0:
+ raise PylockValidationError(
+ "None of vcs, directory, archive must be set if sdist or wheels are set"
+ )
+ if distributions == 0 and direct_urls != 1:
+ raise PylockValidationError(
+ "Exactly one of vcs, directory, archive must be set "
+ "if sdist and wheels are not set"
+ )
+ try:
+ for i, attestation_identity in enumerate( # noqa: B007
+ package.attestation_identities or []
+ ):
+ _get_required(attestation_identity, str, "kind")
+ except Exception as e:
+ raise PylockValidationError(
+ e, context=f"attestation-identities[{i}]"
+ ) from e
+ return package
+
+ @property
+ def is_direct(self) -> bool:
+ return not (self.sdist or self.wheels)
+
+
+@dataclass(frozen=True, init=False)
+class Pylock:
+ """A class representing a pylock file."""
+
+ lock_version: Version
+ environments: Sequence[Marker] | None = None
+ requires_python: SpecifierSet | None = None
+ extras: Sequence[NormalizedName] | None = None
+ dependency_groups: Sequence[str] | None = None
+ default_groups: Sequence[str] | None = None
+ created_by: str # type: ignore[misc]
+ packages: Sequence[Package] # type: ignore[misc]
+ tool: Mapping[str, Any] | None = None
+
+ def __init__(
+ self,
+ *,
+ lock_version: Version,
+ environments: Sequence[Marker] | None = None,
+ requires_python: SpecifierSet | None = None,
+ extras: Sequence[NormalizedName] | None = None,
+ dependency_groups: Sequence[str] | None = None,
+ default_groups: Sequence[str] | None = None,
+ created_by: str,
+ packages: Sequence[Package],
+ tool: Mapping[str, Any] | None = None,
+ ) -> None:
+ # In Python 3.10+ make dataclass kw_only=True and remove __init__
+ object.__setattr__(self, "lock_version", lock_version)
+ object.__setattr__(self, "environments", environments)
+ object.__setattr__(self, "requires_python", requires_python)
+ object.__setattr__(self, "extras", extras)
+ object.__setattr__(self, "dependency_groups", dependency_groups)
+ object.__setattr__(self, "default_groups", default_groups)
+ object.__setattr__(self, "created_by", created_by)
+ object.__setattr__(self, "packages", packages)
+ object.__setattr__(self, "tool", tool)
+
+ @classmethod
+ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
+ pylock = cls(
+ lock_version=_get_required_as(d, str, Version, "lock-version"),
+ environments=_get_sequence_as(d, str, Marker, "environments"),
+ extras=_get_sequence_as(d, str, _validate_normalized_name, "extras"),
+ dependency_groups=_get_sequence(d, str, "dependency-groups"),
+ default_groups=_get_sequence(d, str, "default-groups"),
+ created_by=_get_required(d, str, "created-by"),
+ requires_python=_get_as(d, str, SpecifierSet, "requires-python"),
+ packages=_get_required_sequence_of_objects(d, Package, "packages"),
+ tool=_get(d, Mapping, "tool"), # type: ignore[type-abstract]
+ )
+ if not Version("1") <= pylock.lock_version < Version("2"):
+ raise PylockUnsupportedVersionError(
+ f"pylock version {pylock.lock_version} is not supported"
+ )
+ if pylock.lock_version > Version("1.0"):
+ _logger.warning(
+ "pylock minor version %s is not supported", pylock.lock_version
+ )
+ return pylock
+
+ @classmethod
+ def from_dict(cls, d: Mapping[str, Any], /) -> Self:
+ """Create and validate a Pylock instance from a TOML dictionary.
+
+ Raises :class:`PylockValidationError` if the input data is not
+ spec-compliant.
+ """
+ return cls._from_dict(d)
+
+ def to_dict(self) -> Mapping[str, Any]:
+ """Convert the Pylock instance to a TOML dictionary."""
+ return dataclasses.asdict(self, dict_factory=_toml_dict_factory)
+
+ def validate(self) -> None:
+ """Validate the Pylock instance against the specification.
+
+ Raises :class:`PylockValidationError` otherwise."""
+ self.from_dict(self.to_dict())
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/requirements.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/requirements.py
index 4e068c956..3079be69b 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/requirements.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/requirements.py
@@ -3,7 +3,7 @@
# for complete details.
from __future__ import annotations
-from typing import Any, Iterator
+from typing import Iterator
from ._parser import parse_requirement as _parse_requirement
from ._tokenizer import ParserSyntaxError
@@ -57,7 +57,7 @@ def _iter_parts(self, name: str) -> Iterator[str]:
yield str(self.specifier)
if self.url:
- yield f"@ {self.url}"
+ yield f" @ {self.url}"
if self.marker:
yield " "
@@ -68,17 +68,12 @@ def __str__(self) -> str:
return "".join(self._iter_parts(self.name))
def __repr__(self) -> str:
- return f""
+ return f"<{self.__class__.__name__}('{self}')>"
def __hash__(self) -> int:
- return hash(
- (
- self.__class__.__name__,
- *self._iter_parts(canonicalize_name(self.name)),
- )
- )
+ return hash(tuple(self._iter_parts(canonicalize_name(self.name))))
- def __eq__(self, other: Any) -> bool:
+ def __eq__(self, other: object) -> bool:
if not isinstance(other, Requirement):
return NotImplemented
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/specifiers.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/specifiers.py
index f18016e16..e4b9c442e 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/specifiers.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/specifiers.py
@@ -13,22 +13,33 @@
import abc
import itertools
import re
-from typing import Callable, Iterable, Iterator, TypeVar, Union
+from typing import Callable, Final, Iterable, Iterator, TypeVar, Union
from .utils import canonicalize_version
-from .version import Version
+from .version import InvalidVersion, Version
UnparsedVersion = Union[Version, str]
UnparsedVersionVar = TypeVar("UnparsedVersionVar", bound=UnparsedVersion)
CallableOperator = Callable[[Version, str], bool]
-def _coerce_version(version: UnparsedVersion) -> Version:
+def _coerce_version(version: UnparsedVersion) -> Version | None:
if not isinstance(version, Version):
- version = Version(version)
+ try:
+ version = Version(version)
+ except InvalidVersion:
+ return None
return version
+def _public_version(version: Version) -> Version:
+ return version.__replace__(local=None)
+
+
+def _base_version(version: Version) -> Version:
+ return version.__replace__(pre=None, post=None, dev=None, local=None)
+
+
class InvalidSpecifier(ValueError):
"""
Raised when attempting to create a :class:`Specifier` with a specifier
@@ -42,6 +53,14 @@ class InvalidSpecifier(ValueError):
class BaseSpecifier(metaclass=abc.ABCMeta):
+ __slots__ = ()
+ __match_args__ = ("_str",)
+
+ @property
+ def _str(self) -> str:
+ """Internal property for match_args"""
+ return str(self)
+
@abc.abstractmethod
def __str__(self) -> str:
"""
@@ -73,7 +92,7 @@ def prereleases(self) -> bool | None:
prereleases or it can be set to ``None`` (the default) to use default semantics.
"""
- @prereleases.setter
+ @prereleases.setter # noqa: B027
def prereleases(self, value: bool) -> None:
"""Setter for :attr:`prereleases`.
@@ -106,6 +125,8 @@ class Specifier(BaseSpecifier):
comma-separated version specifiers (which is what package metadata contains).
"""
+ __slots__ = ("_prereleases", "_spec", "_spec_version")
+
_operator_regex_str = r"""
(?P(~=|==|!=|<=|>=|<|>|===))
"""
@@ -204,11 +225,11 @@ class Specifier(BaseSpecifier):
"""
_regex = re.compile(
- r"^\s*" + _operator_regex_str + _version_regex_str + r"\s*$",
+ r"\s*" + _operator_regex_str + _version_regex_str + r"\s*",
re.VERBOSE | re.IGNORECASE,
)
- _operators = {
+ _operators: Final = {
"~=": "compatible",
"==": "equal",
"!=": "not_equal",
@@ -232,7 +253,7 @@ def __init__(self, spec: str = "", prereleases: bool | None = None) -> None:
:raises InvalidSpecifier:
If the given specifier is invalid (i.e. bad syntax).
"""
- match = self._regex.search(spec)
+ match = self._regex.fullmatch(spec)
if not match:
raise InvalidSpecifier(f"Invalid specifier: {spec!r}")
@@ -244,33 +265,62 @@ def __init__(self, spec: str = "", prereleases: bool | None = None) -> None:
# 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:
+ # Specifier version cache
+ self._spec_version: tuple[str, Version] | None = None
+
+ def _get_spec_version(self, version: str) -> Version | None:
+ """One element cache, as only one spec Version is needed per Specifier."""
+ if self._spec_version is not None and self._spec_version[0] == version:
+ return self._spec_version[1]
+
+ version_specifier = _coerce_version(version)
+ if version_specifier is None:
+ return None
+
+ self._spec_version = (version, version_specifier)
+ return version_specifier
+
+ def _require_spec_version(self, version: str) -> Version:
+ """Get spec version, asserting it's valid (not for === operator).
+
+ This method should only be called for operators where version
+ strings are guaranteed to be valid PEP 440 versions (not ===).
+ """
+ spec_version = self._get_spec_version(version)
+ assert spec_version is not None
+ return spec_version
+
+ @property
+ def prereleases(self) -> bool | None:
# 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:
+ # Only the "!=" operator does not imply prereleases when
+ # the version in the specifier is a prerelease.
+ operator, version_str = self._spec
+ if operator != "!=":
+ # The == specifier with trailing .* cannot include prereleases
+ # e.g. "==1.0a1.*" is not valid.
+ if operator == "==" and version_str.endswith(".*"):
+ return False
+
+ # "===" can have arbitrary string versions, so we cannot parse
+ # those, we take prereleases as unknown (None) for those.
+ version = self._get_spec_version(version_str)
+ if version is None:
+ return None
+
+ # For all other operators, use the check if spec Version
+ # object implies pre-releases.
+ if version.is_prerelease:
return True
return False
@prereleases.setter
- def prereleases(self, value: bool) -> None:
+ def prereleases(self, value: bool | None) -> None:
self._prereleases = value
@property
@@ -321,11 +371,17 @@ def __str__(self) -> str:
@property
def _canonical_spec(self) -> tuple[str, str]:
+ operator, version = self._spec
+ if operator == "===" or version.endswith(".*"):
+ return operator, version
+
+ spec_version = self._require_spec_version(version)
+
canonical_version = canonicalize_version(
- self._spec[1],
- strip_trailing_zero=(self._spec[0] != "~="),
+ spec_version, strip_trailing_zero=(operator != "~=")
)
- return self._spec[0], canonical_version
+
+ return operator, canonical_version
def __hash__(self) -> int:
return hash(self._canonical_spec)
@@ -390,7 +446,7 @@ def _compare_equal(self, prospective: Version, spec: str) -> bool:
if spec.endswith(".*"):
# In the case of prefix matching we want to ignore local segment.
normalized_prospective = canonicalize_version(
- prospective.public, strip_trailing_zero=False
+ _public_version(prospective), strip_trailing_zero=False
)
# Get the normalized version string ignoring the trailing .*
normalized_spec = canonicalize_version(spec[:-2], strip_trailing_zero=False)
@@ -415,13 +471,13 @@ def _compare_equal(self, prospective: Version, spec: str) -> bool:
return shortened_prospective == split_spec
else:
# Convert our spec string into a Version
- spec_version = Version(spec)
+ spec_version = self._require_spec_version(spec)
# If the specifier does not have a local segment, then we want to
# act as if the prospective version also does not have a local
# segment.
if not spec_version.local:
- prospective = Version(prospective.public)
+ prospective = _public_version(prospective)
return prospective == spec_version
@@ -432,18 +488,18 @@ 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)
+ return _public_version(prospective) <= self._require_spec_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)
+ return _public_version(prospective) >= self._require_spec_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)
+ spec = self._require_spec_version(spec_str)
# Check to see if the prospective version is less than the spec
# version. If it's not we can short circuit and just return False now
@@ -455,9 +511,12 @@ def _compare_less_than(self, prospective: Version, spec_str: str) -> bool:
# includes is a pre-release version, that we do not accept pre-release
# versions for the version mentioned in the specifier (e.g. <3.1 should
# not match 3.1.dev0, but should match 3.0.dev0).
- if not spec.is_prerelease and prospective.is_prerelease:
- if Version(prospective.base_version) == Version(spec.base_version):
- return False
+ if (
+ not spec.is_prerelease
+ and prospective.is_prerelease
+ and _base_version(prospective) == _base_version(spec)
+ ):
+ return False
# If we've gotten to here, it means that prospective version is both
# less than the spec version *and* it's not a pre-release of the same
@@ -467,7 +526,7 @@ def _compare_less_than(self, prospective: Version, 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.
- spec = Version(spec_str)
+ spec = self._require_spec_version(spec_str)
# Check to see if the prospective version is greater than the spec
# version. If it's not we can short circuit and just return False now
@@ -479,22 +538,26 @@ def _compare_greater_than(self, prospective: Version, spec_str: str) -> bool:
# includes is a post-release version, that we do not accept
# post-release versions for the version mentioned in the specifier
# (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
- if not spec.is_postrelease and prospective.is_postrelease:
- if Version(prospective.base_version) == Version(spec.base_version):
- return False
+ if (
+ not spec.is_postrelease
+ and prospective.is_postrelease
+ and _base_version(prospective) == _base_version(spec)
+ ):
+ return False
# Ensure that we do not allow a local version of the version mentioned
# in the specifier, which is technically greater than, to match.
- if prospective.local is not None:
- if Version(prospective.base_version) == Version(spec.base_version):
- return False
+ if prospective.local is not None and _base_version(
+ prospective
+ ) == _base_version(spec):
+ return False
# If we've gotten to here, it means that prospective version is both
# greater than the spec version *and* it's not a pre-release of the
# same version in the spec.
return True
- def _compare_arbitrary(self, prospective: Version, spec: str) -> bool:
+ def _compare_arbitrary(self, prospective: Version | str, spec: str) -> bool:
return str(prospective).lower() == str(spec).lower()
def __contains__(self, item: str | Version) -> bool:
@@ -512,7 +575,7 @@ def __contains__(self, item: str | Version) -> bool:
>>> "1.0.0" in Specifier(">=1.2.3")
False
>>> "1.3.0a1" in Specifier(">=1.2.3")
- False
+ True
>>> "1.3.0a1" in Specifier(">=1.2.3", prereleases=True)
True
"""
@@ -526,8 +589,8 @@ def contains(self, item: UnparsedVersion, prereleases: bool | None = None) -> bo
: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.
+ ``None`` (the default), it will follow the recommendation from
+ :pep:`440` and match prereleases, as there are no other versions.
>>> Specifier(">=1.2.3").contains("1.2.3")
True
@@ -536,31 +599,14 @@ def contains(self, item: UnparsedVersion, prereleases: bool | None = None) -> bo
>>> 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)
+ >>> Specifier(">=1.2.3", prereleases=False).contains("1.3.0a1")
+ False
+ >>> Specifier(">=1.2.3").contains("1.3.0a1")
True
"""
- # 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)
+ return bool(list(self.filter([item], prereleases=prereleases)))
def filter(
self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
@@ -572,13 +618,8 @@ def filter(
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.
+ ``None`` (the default), it will follow the recommendation from :pep:`440`
+ and match prereleases if there are no other versions.
>>> list(Specifier(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
['1.3']
@@ -591,40 +632,46 @@ def filter(
>>> list(Specifier(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"]))
['1.3', '1.5a1']
"""
+ prereleases_versions = []
+ found_non_prereleases = False
- yielded = False
- found_prereleases = []
+ # Determine if to include prereleases by default
+ include_prereleases = (
+ prereleases if prereleases is not None else self.prereleases
+ )
- kw = {"prereleases": prereleases if prereleases is not None else True}
+ # Get the matching operator
+ operator_callable = self._get_operator(self.operator)
- # Attempt to iterate over all the values in the iterable and if any of
- # them match, yield them.
+ # Filter versions
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
+ if parsed_version is None:
+ # === operator can match arbitrary (non-version) strings
+ if self.operator == "===" and self._compare_arbitrary(
+ version, self.version
):
- 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
+ elif operator_callable(parsed_version, self.version):
+ # If it's not a prerelease or prereleases are allowed, yield it directly
+ if not parsed_version.is_prerelease or include_prereleases:
+ found_non_prereleases = True
+ yield version
+ # Otherwise collect prereleases for potential later use
+ elif prereleases is None and self._prereleases is not False:
+ prereleases_versions.append(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
+ # If no non-prereleases were found and prereleases weren't
+ # explicitly forbidden, yield the collected prereleases
+ if (
+ not found_non_prereleases
+ and prereleases is None
+ and self._prereleases is not False
+ ):
+ yield from prereleases_versions
-_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
+_prefix_regex = re.compile(r"([0-9]+)((?:a|b|c|rc)[0-9]+)")
def _version_split(version: str) -> list[str]:
@@ -641,7 +688,7 @@ def _version_split(version: str) -> list[str]:
result.append(epoch or "0")
for item in rest.split("."):
- match = _prefix_regex.search(item)
+ match = _prefix_regex.fullmatch(item)
if match:
result.extend(match.groups())
else:
@@ -694,6 +741,8 @@ class SpecifierSet(BaseSpecifier):
specifiers (``>=3.0,!=3.1``), or no specifier at all.
"""
+ __slots__ = ("_prereleases", "_specs")
+
def __init__(
self,
specifiers: str | Iterable[Specifier] = "",
@@ -747,10 +796,13 @@ def prereleases(self) -> bool | 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)
+ if any(s.prereleases for s in self._specs):
+ return True
+
+ return None
@prereleases.setter
- def prereleases(self, value: bool) -> None:
+ def prereleases(self, value: bool | None) -> None:
self._prereleases = value
def __repr__(self) -> str:
@@ -810,14 +862,13 @@ def __and__(self, other: SpecifierSet | str) -> SpecifierSet:
if self._prereleases is None and other._prereleases is not None:
specifier._prereleases = other._prereleases
- elif self._prereleases is not None and other._prereleases is None:
- specifier._prereleases = self._prereleases
- elif self._prereleases == other._prereleases:
+ elif (
+ self._prereleases is not None and other._prereleases is None
+ ) or self._prereleases == other._prereleases:
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
@@ -877,7 +928,7 @@ def __contains__(self, item: UnparsedVersion) -> bool:
>>> "1.0.1" in SpecifierSet(">=1.0.0,!=1.0.1")
False
>>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1")
- False
+ True
>>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True)
True
"""
@@ -896,8 +947,11 @@ def contains(
: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.
+ ``None`` (the default), it will follow the recommendation from :pep:`440`
+ and match prereleases, as there are no other versions.
+ :param installed:
+ Whether or not the item is installed. If set to ``True``, it will
+ accept prerelease versions even if the specifier does not allow them.
>>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.2.3")
True
@@ -906,39 +960,19 @@ def contains(
>>> 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", prereleases=False).contains("1.3.0a1")
+ False
>>> 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
- # SpecifierSet thinks for whether or not we should support prereleases.
- if prereleases is None:
- prereleases = self.prereleases
+ version = _coerce_version(item)
- # We can determine if we're going to allow pre-releases by looking to
- # see if any of the underlying items supports them. If none of them do
- # and this item is a pre-release then we do not allow it and we can
- # short circuit that here.
- # Note: This means that 1.0.dev1 would not be contained in something
- # like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
- if not prereleases and item.is_prerelease:
- return False
-
- if installed and item.is_prerelease:
- item = Version(item.base_version)
+ if version is not None and installed and version.is_prerelease:
+ prereleases = True
- # 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
- # will always return True, this is an explicit design decision.
- return all(s.contains(item, prereleases=prereleases) for s in self._specs)
+ check_item = item if version is None else version
+ return bool(list(self.filter([check_item], prereleases=prereleases)))
def filter(
self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
@@ -950,20 +984,15 @@ def filter(
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.
+ ``None`` (the default), it will follow the recommendation from :pep:`440`
+ and match prereleases if there are no other versions.
>>> 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"]))
- []
+ ['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"]))
@@ -984,37 +1013,56 @@ def filter(
# 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.
- if prereleases is None:
+ if prereleases is None and self.prereleases is not None:
prereleases = self.prereleases
# If we have any specifiers, then we want to wrap our iterable in the
# filter method for each one, this will act as a logical AND amongst
# each specifier.
if self._specs:
+ # When prereleases is None, we need to let all versions through
+ # the individual filters, then decide about prereleases at the end
+ # based on whether any non-prereleases matched ALL specs.
for spec in self._specs:
- iterable = spec.filter(iterable, prereleases=bool(prereleases))
- 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.
+ iterable = spec.filter(
+ iterable, prereleases=True if prereleases is None else prereleases
+ )
+
+ if prereleases is not None:
+ # If we have a forced prereleases value,
+ # we can immediately return the iterator.
+ return iter(iterable)
else:
- filtered: list[UnparsedVersionVar] = []
- found_prereleases: list[UnparsedVersionVar] = []
-
- for item in iterable:
- 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
- if parsed_version.is_prerelease and not prereleases:
- if not filtered:
- found_prereleases.append(item)
- else:
- filtered.append(item)
-
- # 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 iter(found_prereleases)
-
- return iter(filtered)
+ # Handle empty SpecifierSet cases where prereleases is not None.
+ if prereleases is True:
+ return iter(iterable)
+
+ if prereleases is False:
+ return (
+ item
+ for item in iterable
+ if (version := _coerce_version(item)) is None
+ or not version.is_prerelease
+ )
+
+ # Finally if prereleases is None, apply PEP 440 logic:
+ # exclude prereleases unless there are no final releases that matched.
+ filtered_items: list[UnparsedVersionVar] = []
+ found_prereleases: list[UnparsedVersionVar] = []
+ found_final_release = False
+
+ for item in iterable:
+ parsed_version = _coerce_version(item)
+ # Arbitrary strings are always included as it is not
+ # possible to determine if they are prereleases,
+ # and they have already passed all specifiers.
+ if parsed_version is None:
+ filtered_items.append(item)
+ found_prereleases.append(item)
+ elif parsed_version.is_prerelease:
+ found_prereleases.append(item)
+ else:
+ filtered_items.append(item)
+ found_final_release = True
+
+ return iter(filtered_items if found_final_release else found_prereleases)
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/tags.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/tags.py
index f5903402a..5ef27c897 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/tags.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/tags.py
@@ -13,6 +13,7 @@
import sysconfig
from importlib.machinery import EXTENSION_SUFFIXES
from typing import (
+ Any,
Iterable,
Iterator,
Sequence,
@@ -92,6 +93,13 @@ def __str__(self) -> str:
def __repr__(self) -> str:
return f"<{self} @ {id(self)}>"
+ def __setstate__(self, state: tuple[None, dict[str, Any]]) -> None:
+ # The cached _hash is wrong when unpickling.
+ _, slots = state
+ for k, v in slots.items():
+ setattr(self, k, v)
+ self._hash = hash((self._interpreter, self._abi, self._platform))
+
def parse_tag(tag: str) -> frozenset[Tag]:
"""
@@ -209,16 +217,13 @@ def cpython_tags(
interpreter = f"cp{_version_nodot(python_version[:2])}"
if abis is None:
- if len(python_version) > 1:
- abis = _cpython_abis(python_version, warn)
- else:
- abis = []
+ abis = _cpython_abis(python_version, warn) if len(python_version) > 1 else []
abis = list(abis)
# 'abi3' and 'none' are explicitly handled later.
for explicit_abi in ("abi3", "none"):
try:
abis.remove(explicit_abi)
- except ValueError:
+ except ValueError: # noqa: PERF203
pass
platforms = list(platforms or platform_tags())
@@ -299,11 +304,8 @@ def generic_tags(
if not interpreter:
interp_name = interpreter_name()
interp_version = interpreter_version(warn=warn)
- interpreter = "".join([interp_name, interp_version])
- if abis is None:
- abis = _generic_abi()
- else:
- abis = list(abis)
+ interpreter = f"{interp_name}{interp_version}"
+ abis = _generic_abi() if abis is None else list(abis)
platforms = list(platforms or platform_tags())
if "none" not in abis:
abis.append("none")
@@ -424,14 +426,11 @@ def mac_platforms(
text=True,
).stdout
version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
- else:
- version = version
+
if arch is None:
arch = _mac_arch(cpu_arch)
- else:
- arch = arch
- if (10, 0) <= version and version < (11, 0):
+ if (10, 0) <= 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
@@ -530,6 +529,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 +597,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:
@@ -583,11 +621,7 @@ def interpreter_version(*, warn: bool = False) -> str:
Returns the version of the running interpreter.
"""
version = _get_config_var("py_version_nodot", warn=warn)
- if version:
- version = str(version)
- else:
- version = _version_nodot(sys.version_info[:2])
- return version
+ return str(version) if version else _version_nodot(sys.version_info[:2])
def _version_nodot(version: PythonVersion) -> str:
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/utils.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/utils.py
index 23450953d..c41c8137f 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/utils.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/utils.py
@@ -4,7 +4,6 @@
from __future__ import annotations
-import functools
import re
from typing import NewType, Tuple, Union, cast
@@ -34,28 +33,29 @@ 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])$")
+_validate_regex = re.compile(r"[A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9]", re.IGNORECASE)
+_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, *, validate: bool = False) -> NormalizedName:
- if validate and not _validate_regex.match(name):
+ if validate and not _validate_regex.fullmatch(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)
+ # Ensure all ``.`` and ``_`` are ``-``
+ # Emulates ``re.sub(r"[-_.]+", "-", name).lower()`` from PEP 503
+ # Much faster than re, and even faster than str.translate
+ value = name.lower().replace("_", "-").replace(".", "-")
+ # Condense repeats (faster than regex)
+ while "--" in value:
+ value = value.replace("--", "-")
+ return cast("NormalizedName", value)
def is_normalized_name(name: str) -> bool:
- return _normalized_regex.match(name) is not None
+ return _normalized_regex.fullmatch(name) is not None
-@functools.singledispatch
def canonicalize_version(
version: Version | str, *, strip_trailing_zero: bool = True
) -> str:
@@ -78,17 +78,12 @@ def canonicalize_version(
>>> canonicalize_version('foo bar baz')
'foo bar baz'
"""
- return str(_TrimmedRelease(str(version)) if strip_trailing_zero else version)
-
-
-@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)
+ if isinstance(version, str):
+ try:
+ version = Version(version)
+ except InvalidVersion:
+ return str(version)
+ return str(_TrimmedRelease(version) if strip_trailing_zero else version)
def parse_wheel_filename(
@@ -127,7 +122,7 @@ def parse_wheel_filename(
raise InvalidWheelFilename(
f"Invalid build number: {build_part} in {filename!r}"
)
- build = cast(BuildTag, (int(build_match.group(1)), build_match.group(2)))
+ build = cast("BuildTag", (int(build_match.group(1)), build_match.group(2)))
else:
build = ()
tags = parse_tag(parts[-1])
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/packaging/version.py b/addons/source-python/packages/site-packages/pip/_vendor/packaging/version.py
index 21f44ca09..d250a2627 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/packaging/version.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/packaging/version.py
@@ -9,12 +9,59 @@
from __future__ import annotations
-import itertools
import re
-from typing import Any, Callable, NamedTuple, SupportsInt, Tuple, Union
+import sys
+import typing
+from typing import (
+ Any,
+ Callable,
+ Literal,
+ NamedTuple,
+ SupportsInt,
+ Tuple,
+ TypedDict,
+ Union,
+)
from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType
+if typing.TYPE_CHECKING:
+ from typing_extensions import Self, Unpack
+
+if sys.version_info >= (3, 13): # pragma: no cover
+ from warnings import deprecated as _deprecated
+elif typing.TYPE_CHECKING:
+ from typing_extensions import deprecated as _deprecated
+else: # pragma: no cover
+ import functools
+ import warnings
+
+ def _deprecated(message: str) -> object:
+ def decorator(func: object) -> object:
+ @functools.wraps(func)
+ def wrapper(*args: object, **kwargs: object) -> object:
+ warnings.warn(
+ message,
+ category=DeprecationWarning,
+ stacklevel=2,
+ )
+ return func(*args, **kwargs)
+
+ return wrapper
+
+ return decorator
+
+
+_LETTER_NORMALIZATION = {
+ "alpha": "a",
+ "beta": "b",
+ "c": "rc",
+ "pre": "rc",
+ "preview": "rc",
+ "rev": "post",
+ "r": "post",
+}
+
__all__ = ["VERSION_PATTERN", "InvalidVersion", "Version", "parse"]
LocalType = Tuple[Union[int, str], ...]
@@ -35,13 +82,13 @@
VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool]
-class _Version(NamedTuple):
- epoch: int
- release: tuple[int, ...]
- dev: tuple[str, int] | None
- pre: tuple[str, int] | None
- post: tuple[str, int] | None
- local: LocalType | None
+class _VersionReplace(TypedDict, total=False):
+ epoch: int | None
+ release: tuple[int, ...] | None
+ pre: tuple[Literal["a", "b", "rc"], int] | None
+ post: int | None
+ dev: int | None
+ local: str | None
def parse(version: str) -> Version:
@@ -67,7 +114,15 @@ class InvalidVersion(ValueError):
class _BaseVersion:
- _key: tuple[Any, ...]
+ __slots__ = ()
+
+ # This can also be a normal member (see the packaging_legacy package);
+ # we are just requiring it to be readable. Actually defining a property
+ # has runtime effect on subclasses, so it's typing only.
+ if typing.TYPE_CHECKING:
+
+ @property
+ def _key(self) -> tuple[Any, ...]: ...
def __hash__(self) -> int:
return hash(self._key)
@@ -114,38 +169,56 @@ def __ne__(self, other: object) -> bool:
# Deliberately not anchored to the start and end of the string, to make it
# easier for 3rd party code to reuse
+
+# Note that ++ doesn't behave identically on CPython and PyPy, so not using it here
_VERSION_PATTERN = r"""
- v?
+ v?+ # optional leading v
(?:
- (?:(?P[0-9]+)!)? # epoch
- (?P[0-9]+(?:\.[0-9]+)*) # release segment
+ (?:(?P[0-9]+)!)?+ # epoch
+ (?P[0-9]+(?:\.[0-9]+)*+) # release segment
(?P # pre-release
- [-_\.]?
+ [._-]?+
(?Palpha|a|beta|b|preview|pre|c|rc)
- [-_\.]?
+ [._-]?+
(?P[0-9]+)?
- )?
+ )?+
(?P # post release
(?:-(?P[0-9]+))
|
(?:
- [-_\.]?
+ [._-]?
(?Ppost|rev|r)
- [-_\.]?
+ [._-]?
(?P[0-9]+)?
)
- )?
+ )?+
(?P # dev release
- [-_\.]?
+ [._-]?+
(?Pdev)
- [-_\.]?
+ [._-]?+
(?P[0-9]+)?
- )?
+ )?+
)
- (?:\+(?P[a-z0-9]+(?:[-_\.][a-z0-9]+)*))? # local version
+ (?:\+
+ (?P # local version
+ [a-z0-9]+
+ (?:[._-][a-z0-9]+)*+
+ )
+ )?+
"""
-VERSION_PATTERN = _VERSION_PATTERN
+_VERSION_PATTERN_OLD = _VERSION_PATTERN.replace("*+", "*").replace("?+", "?")
+
+# Possessive qualifiers were added in Python 3.11.
+# CPython 3.11.0-3.11.4 had a bug: https://github.com/python/cpython/pull/107795
+# Older PyPy also had a bug.
+VERSION_PATTERN = (
+ _VERSION_PATTERN_OLD
+ if (sys.implementation.name == "cpython" and sys.version_info < (3, 11, 5))
+ or (sys.implementation.name == "pypy" and sys.version_info < (3, 11, 13))
+ or sys.version_info < (3, 11)
+ else _VERSION_PATTERN
+)
"""
A string containing the regular expression used to match a valid version.
@@ -158,6 +231,82 @@ def __ne__(self, other: object) -> bool:
"""
+# Validation pattern for local version in replace()
+_LOCAL_PATTERN = re.compile(r"[a-z0-9]+(?:[._-][a-z0-9]+)*", re.IGNORECASE)
+
+
+def _validate_epoch(value: object, /) -> int:
+ epoch = value or 0
+ if isinstance(epoch, int) and epoch >= 0:
+ return epoch
+ msg = f"epoch must be non-negative integer, got {epoch}"
+ raise InvalidVersion(msg)
+
+
+def _validate_release(value: object, /) -> tuple[int, ...]:
+ release = (0,) if value is None else value
+ if (
+ isinstance(release, tuple)
+ and len(release) > 0
+ and all(isinstance(i, int) and i >= 0 for i in release)
+ ):
+ return release
+ msg = f"release must be a non-empty tuple of non-negative integers, got {release}"
+ raise InvalidVersion(msg)
+
+
+def _validate_pre(value: object, /) -> tuple[Literal["a", "b", "rc"], int] | None:
+ if value is None:
+ return value
+ if (
+ isinstance(value, tuple)
+ and len(value) == 2
+ and value[0] in ("a", "b", "rc")
+ and isinstance(value[1], int)
+ and value[1] >= 0
+ ):
+ return value
+ msg = f"pre must be a tuple of ('a'|'b'|'rc', non-negative int), got {value}"
+ raise InvalidVersion(msg)
+
+
+def _validate_post(value: object, /) -> tuple[Literal["post"], int] | None:
+ if value is None:
+ return value
+ if isinstance(value, int) and value >= 0:
+ return ("post", value)
+ msg = f"post must be non-negative integer, got {value}"
+ raise InvalidVersion(msg)
+
+
+def _validate_dev(value: object, /) -> tuple[Literal["dev"], int] | None:
+ if value is None:
+ return value
+ if isinstance(value, int) and value >= 0:
+ return ("dev", value)
+ msg = f"dev must be non-negative integer, got {value}"
+ raise InvalidVersion(msg)
+
+
+def _validate_local(value: object, /) -> LocalType | None:
+ if value is None:
+ return value
+ if isinstance(value, str) and _LOCAL_PATTERN.fullmatch(value):
+ return _parse_local_version(value)
+ msg = f"local must be a valid version string, got {value!r}"
+ raise InvalidVersion(msg)
+
+
+# Backward compatibility for internals before 26.0. Do not use.
+class _Version(NamedTuple):
+ epoch: int
+ release: tuple[int, ...]
+ dev: tuple[str, int] | None
+ pre: tuple[str, int] | None
+ post: tuple[str, int] | None
+ local: LocalType | None
+
+
class Version(_BaseVersion):
"""This class abstracts handling of a project's versions.
@@ -182,8 +331,19 @@ class Version(_BaseVersion):
True
"""
- _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
- _key: CmpKey
+ __slots__ = ("_dev", "_epoch", "_key_cache", "_local", "_post", "_pre", "_release")
+ __match_args__ = ("_str",)
+
+ _regex = re.compile(r"\s*" + VERSION_PATTERN + r"\s*", re.VERBOSE | re.IGNORECASE)
+
+ _epoch: int
+ _release: tuple[int, ...]
+ _dev: tuple[str, int] | None
+ _pre: tuple[str, int] | None
+ _post: tuple[str, int] | None
+ _local: LocalType | None
+
+ _key_cache: CmpKey | None
def __init__(self, version: str) -> None:
"""Initialize a Version object.
@@ -195,34 +355,86 @@ def __init__(self, version: str) -> None:
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)
+ match = self._regex.fullmatch(version)
if not match:
raise InvalidVersion(f"Invalid version: {version!r}")
-
- # Store the parsed out pieces of the version
- self._version = _Version(
- epoch=int(match.group("epoch")) if match.group("epoch") else 0,
- release=tuple(int(i) for i in match.group("release").split(".")),
- pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
- post=_parse_letter_version(
- match.group("post_l"), match.group("post_n1") or match.group("post_n2")
- ),
- dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
- local=_parse_local_version(match.group("local")),
+ self._epoch = int(match.group("epoch")) if match.group("epoch") else 0
+ self._release = tuple(map(int, match.group("release").split(".")))
+ self._pre = _parse_letter_version(match.group("pre_l"), match.group("pre_n"))
+ self._post = _parse_letter_version(
+ match.group("post_l"), match.group("post_n1") or match.group("post_n2")
+ )
+ self._dev = _parse_letter_version(match.group("dev_l"), match.group("dev_n"))
+ self._local = _parse_local_version(match.group("local"))
+
+ # Key which will be used for sorting
+ self._key_cache = None
+
+ def __replace__(self, **kwargs: Unpack[_VersionReplace]) -> Self:
+ epoch = _validate_epoch(kwargs["epoch"]) if "epoch" in kwargs else self._epoch
+ release = (
+ _validate_release(kwargs["release"])
+ if "release" in kwargs
+ else self._release
)
+ pre = _validate_pre(kwargs["pre"]) if "pre" in kwargs else self._pre
+ post = _validate_post(kwargs["post"]) if "post" in kwargs else self._post
+ dev = _validate_dev(kwargs["dev"]) if "dev" in kwargs else self._dev
+ local = _validate_local(kwargs["local"]) if "local" in kwargs else self._local
+
+ if (
+ epoch == self._epoch
+ and release == self._release
+ and pre == self._pre
+ and post == self._post
+ and dev == self._dev
+ and local == self._local
+ ):
+ return self
+
+ new_version = self.__class__.__new__(self.__class__)
+ new_version._key_cache = None
+ new_version._epoch = epoch
+ new_version._release = release
+ new_version._pre = pre
+ new_version._post = post
+ new_version._dev = dev
+ new_version._local = local
+
+ return new_version
+
+ @property
+ def _key(self) -> CmpKey:
+ if self._key_cache is None:
+ self._key_cache = _cmpkey(
+ self._epoch,
+ self._release,
+ self._pre,
+ self._post,
+ self._dev,
+ self._local,
+ )
+ return self._key_cache
- # Generate a key which will be used for sorting
- self._key = _cmpkey(
- self._version.epoch,
- self._version.release,
- self._version.pre,
- self._version.post,
- self._version.dev,
- self._version.local,
+ @property
+ @_deprecated("Version._version is private and will be removed soon")
+ def _version(self) -> _Version:
+ return _Version(
+ self._epoch, self._release, self._dev, self._pre, self._post, self._local
)
+ @_version.setter
+ @_deprecated("Version._version is private and will be removed soon")
+ def _version(self, value: _Version) -> None:
+ self._epoch = value.epoch
+ self._release = value.release
+ self._dev = value.dev
+ self._pre = value.pre
+ self._post = value.post
+ self._local = value.local
+ self._key_cache = None
+
def __repr__(self) -> str:
"""A representation of the Version that shows all internal state.
@@ -237,32 +449,35 @@ def __str__(self) -> str:
>>> str(Version("1.0a5"))
'1.0a5'
"""
- parts = []
+ # This is a hot function, so not calling self.base_version
+ version = ".".join(map(str, self.release))
# Epoch
- if self.epoch != 0:
- parts.append(f"{self.epoch}!")
-
- # Release segment
- parts.append(".".join(str(x) for x in self.release))
+ if self.epoch:
+ version = f"{self.epoch}!{version}"
# Pre-release
if self.pre is not None:
- parts.append("".join(str(x) for x in self.pre))
+ version += "".join(map(str, self.pre))
# Post-release
if self.post is not None:
- parts.append(f".post{self.post}")
+ version += f".post{self.post}"
# Development release
if self.dev is not None:
- parts.append(f".dev{self.dev}")
+ version += f".dev{self.dev}"
# Local version segment
if self.local is not None:
- parts.append(f"+{self.local}")
+ version += f"+{self.local}"
+
+ return version
- return "".join(parts)
+ @property
+ def _str(self) -> str:
+ """Internal property for match_args"""
+ return str(self)
@property
def epoch(self) -> int:
@@ -273,7 +488,7 @@ def epoch(self) -> int:
>>> Version("1!2.0.0").epoch
1
"""
- return self._version.epoch
+ return self._epoch
@property
def release(self) -> tuple[int, ...]:
@@ -289,7 +504,7 @@ def release(self) -> tuple[int, ...]:
Includes trailing zeroes but not the epoch or any pre-release / development /
post-release suffixes.
"""
- return self._version.release
+ return self._release
@property
def pre(self) -> tuple[str, int] | None:
@@ -304,7 +519,7 @@ def pre(self) -> tuple[str, int] | None:
>>> Version("1.2.3rc1").pre
('rc', 1)
"""
- return self._version.pre
+ return self._pre
@property
def post(self) -> int | None:
@@ -315,7 +530,7 @@ def post(self) -> int | None:
>>> Version("1.2.3.post1").post
1
"""
- return self._version.post[1] if self._version.post else None
+ return self._post[1] if self._post else None
@property
def dev(self) -> int | None:
@@ -326,7 +541,7 @@ def dev(self) -> int | None:
>>> Version("1.2.3.dev1").dev
1
"""
- return self._version.dev[1] if self._version.dev else None
+ return self._dev[1] if self._dev else None
@property
def local(self) -> str | None:
@@ -337,8 +552,8 @@ def local(self) -> str | None:
>>> Version("1.2.3+abc").local
'abc'
"""
- if self._version.local:
- return ".".join(str(x) for x in self._version.local)
+ if self._local:
+ return ".".join(str(x) for x in self._local)
else:
return None
@@ -369,16 +584,8 @@ def base_version(self) -> str:
The "base version" is the public version of the project without any pre or post
release markers.
"""
- parts = []
-
- # Epoch
- if self.epoch != 0:
- parts.append(f"{self.epoch}!")
-
- # Release segment
- parts.append(".".join(str(x) for x in self.release))
-
- return "".join(parts)
+ release_segment = ".".join(map(str, self.release))
+ return f"{self.epoch}!{release_segment}" if self.epoch else release_segment
@property
def is_prerelease(self) -> bool:
@@ -452,6 +659,20 @@ def micro(self) -> int:
class _TrimmedRelease(Version):
+ __slots__ = ()
+
+ def __init__(self, version: str | Version) -> None:
+ if isinstance(version, Version):
+ self._epoch = version._epoch
+ self._release = version._release
+ self._dev = version._dev
+ self._pre = version._pre
+ self._post = version._post
+ self._local = version._local
+ self._key_cache = version._key_cache
+ return
+ super().__init__(version) # pragma: no cover
+
@property
def release(self) -> tuple[int, ...]:
"""
@@ -462,45 +683,35 @@ def release(self) -> tuple[int, ...]:
>>> _TrimmedRelease('0.0').release
(0,)
"""
+ # This leaves one 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]
+ len_release = len(rel)
+ i = len_release
+ while i > 1 and rel[i - 1] == 0:
+ i -= 1
+ return rel if i == len_release else rel[:i]
def _parse_letter_version(
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.
- if number is None:
- number = 0
-
# We normalize any letters to their lower case form
letter = letter.lower()
# We consider some words to be alternate spellings of other words and
# in those cases we want to normalize the spellings to our preferred
# spelling.
- if letter == "alpha":
- letter = "a"
- elif letter == "beta":
- letter = "b"
- elif letter in ["c", "pre", "preview"]:
- letter = "rc"
- elif letter in ["rev", "r"]:
- letter = "post"
-
- return letter, int(number)
-
- assert not letter
+ letter = _LETTER_NORMALIZATION.get(letter, letter)
+
+ # We consider there to be an implicit 0 in a pre-release if there is
+ # not a numeral associated with it.
+ return letter, int(number or 0)
+
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"
-
- return letter, int(number)
+ return "post", int(number)
return None
@@ -529,13 +740,12 @@ def _cmpkey(
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
- # re-reverse it back into the correct order and make it a tuple and use
- # that for our sorting key.
- _release = tuple(
- reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
- )
+ # trailing zeros removed. We will use this for our sorting key.
+ len_release = len(release)
+ i = len_release
+ while i and release[i - 1] == 0:
+ i -= 1
+ _release = release if i == len_release else release[:i]
# We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
# We'll do this by abusing the pre segment, but we _only_ want to do this
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/pkg_resources/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/pkg_resources/LICENSE
new file mode 100644
index 000000000..1bb5a4435
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/pkg_resources/LICENSE
@@ -0,0 +1,17 @@
+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/addons/source-python/packages/site-packages/pip/_vendor/pkg_resources/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/pkg_resources/__init__.py
index 57ce7f100..72f2b0351 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pkg_resources/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/pkg_resources/__init__.py
@@ -100,7 +100,7 @@
if TYPE_CHECKING:
from _typeshed import BytesPath, StrPath, StrOrBytesPath
- from pip._vendor.typing_extensions import Self
+ from typing_extensions import Self
# Patch: Remove deprecation warning from vendored pkg_resources.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/LICENSE
new file mode 100644
index 000000000..f35fed919
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2010-202x The platformdirs developers
+
+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/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/__init__.py
index edc21fad2..2325ec2eb 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/android.py b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/android.py
index 7004a8524..92efc852d 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/android.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/api.py b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/api.py
index 18d660e4f..251600e6d 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/api.py
+++ b/addons/source-python/packages/site-packages/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
@@ -94,7 +95,7 @@ def _optionally_create_directory(self, path: str) -> None:
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]
+ directory = directory.partition(os.pathsep)[0]
return Path(directory)
@property
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/macos.py b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/macos.py
index e4b0391ab..30ab36891 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/macos.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/macos.py
@@ -34,13 +34,14 @@ 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``.
+ will be under the Homebrew prefix, e.g. ``$homebrew_prefix/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``
+ ``$homebrew_prefix/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 []
+ is_homebrew = "/opt/python" in sys.prefix
+ homebrew_prefix = sys.prefix.split("/opt/python")[0] if is_homebrew else ""
+ path_list = [self._append_app_name_and_version(f"{homebrew_prefix}/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)
@@ -71,13 +72,14 @@ 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``.
+ will be under the Homebrew prefix, e.g. ``$homebrew_prefix/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``
+ ``$homebrew_prefix/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 []
+ is_homebrew = "/opt/python" in sys.prefix
+ homebrew_prefix = sys.prefix.split("/opt/python")[0] if is_homebrew else ""
+ path_list = [self._append_app_name_and_version(f"{homebrew_prefix}/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)
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/unix.py b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/unix.py
index f1942e92e..fc75d8d07 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/unix.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/version.py b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/version.py
index afb49243e..fcf6f03a1 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/version.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/version.py
@@ -1,16 +1,34 @@
-# 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",
+ "__commit_id__",
+ "commit_id",
+]
+
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], ...]
+ COMMIT_ID = Union[str, None]
else:
VERSION_TUPLE = object
+ COMMIT_ID = object
version: str
__version__: str
__version_tuple__: VERSION_TUPLE
version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '4.5.1'
+__version_tuple__ = version_tuple = (4, 5, 1)
-__version__ = version = '4.3.6'
-__version_tuple__ = version_tuple = (4, 3, 6)
+__commit_id__ = commit_id = None
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/windows.py b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/windows.py
index d7bc96091..8d523a9c6 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/windows.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/platformdirs/windows.py
@@ -188,6 +188,9 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
for all CSIDL_* names.
"""
+ machine_names = {
+ "CSIDL_COMMON_APPDATA",
+ }
shell_folder_name = {
"CSIDL_APPDATA": "AppData",
"CSIDL_COMMON_APPDATA": "Common AppData",
@@ -205,7 +208,10 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
raise NotImplementedError
import winreg # noqa: PLC0415
- key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
+ # Use HKEY_LOCAL_MACHINE for system-wide folders, HKEY_CURRENT_USER for user-specific folders
+ hkey = winreg.HKEY_LOCAL_MACHINE if csidl_name in machine_names else winreg.HKEY_CURRENT_USER
+
+ key = winreg.OpenKey(hkey, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
directory, _ = winreg.QueryValueEx(key, shell_folder_name)
return str(directory)
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/pygments/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/pygments/LICENSE
new file mode 100644
index 000000000..446a1a805
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/pygments/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2006-2022 by the respective authors (see AUTHORS file).
+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.
+
+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/addons/source-python/packages/site-packages/pip/_vendor/pygments/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/__init__.py
index 60ae9bb85..cb229c985 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/__init__.py
+++ b/addons/source-python/packages/site-packages/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.2'
__docformat__ = 'restructuredtext'
__all__ = ['lex', 'format', 'highlight']
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/pygments/__main__.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/__main__.py
index dcc6e5add..a2e612f51 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/__main__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/console.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/console.py
index 4c1a06219..ee1ac27a2 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/console.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/filter.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/filter.py
index aa6f76041..5efff438d 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/filter.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/filters/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/filters/__init__.py
index 9255ca224..97380c92d 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/filters/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/formatter.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/formatter.py
index d2666037f..0041e41a1 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/formatter.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/formatters/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/formatters/__init__.py
index f19e9931f..014f2ee8d 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/formatters/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexer.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexer.py
index 1348be587..c05aa8196 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexer.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/__init__.py
index ac88645a1..49184ec8a 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/_mapping.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/_mapping.py
index f3e5c460d..c0d6a8ad2 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/_mapping.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/python.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/python.py
index b2d07f208..1b7882961 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/lexers/python.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/modeline.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/modeline.py
index e4d9fe167..c310f0edb 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/modeline.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/plugin.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/plugin.py
index 2e462f2c2..498db4238 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/plugin.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/regexopt.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/regexopt.py
index c44eedbf2..cc8d2c31b 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/regexopt.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/scanner.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/scanner.py
index 112da3491..3c8c84873 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/scanner.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/sphinxext.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/sphinxext.py
index 34077a2ae..955d9584f 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/sphinxext.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/style.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/style.py
index 076e63f83..be5f83228 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/style.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/styles/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/styles/__init__.py
index 712f6e699..96d53dce0 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/styles/__init__.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/token.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/token.py
index f78018a7a..2f3b97e09 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/token.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/unistring.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/unistring.py
index e2c3523e4..e3bd2e727 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/unistring.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pygments/util.py b/addons/source-python/packages/site-packages/pip/_vendor/pygments/util.py
index 83cf10492..71c5710ae 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/pygments/util.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/pyproject_hooks/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/pyproject_hooks/LICENSE
new file mode 100644
index 000000000..b0ae9dbc2
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/pyproject_hooks/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Thomas Kluyver
+
+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/addons/source-python/packages/site-packages/pip/_vendor/requests/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/requests/LICENSE
new file mode 100644
index 000000000..67db85882
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/requests/LICENSE
@@ -0,0 +1,175 @@
+
+ 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.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/requests/__version__.py b/addons/source-python/packages/site-packages/pip/_vendor/requests/__version__.py
index 2c105aca7..effdd98cf 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/requests/__version__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/requests/__version__.py
@@ -5,8 +5,8 @@
__title__ = "requests"
__description__ = "Python HTTP for Humans."
__url__ = "https://requests.readthedocs.io"
-__version__ = "2.32.3"
-__build__ = 0x023203
+__version__ = "2.32.5"
+__build__ = 0x023205
__author__ = "Kenneth Reitz"
__author_email__ = "me@kennethreitz.org"
__license__ = "Apache-2.0"
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/requests/adapters.py b/addons/source-python/packages/site-packages/pip/_vendor/requests/adapters.py
index 703077746..67ccebcbe 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/requests/adapters.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/requests/adapters.py
@@ -27,7 +27,6 @@
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
@@ -74,19 +73,6 @@ def SOCKSProxyManager(*args, **kwargs):
DEFAULT_POOL_TIMEOUT = None
-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",
@@ -99,19 +85,9 @@ def _urllib3_request_context(
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 and should_use_default_ssl_context:
- pool_kwargs["ssl_context"] = _preloaded_ssl_context
elif isinstance(verify, str):
if not os.path.isdir(verify):
pool_kwargs["ca_certs"] = verify
@@ -314,26 +290,27 @@ 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
- # 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()
+ # Allow self-specified cert location.
if verify is not True:
- # `verify` must be a str with a path then
cert_loc = verify
- 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:
+ cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
- if not os.path.isdir(cert_loc):
- conn.ca_certs = cert_loc
- else:
- conn.ca_cert_dir = 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
else:
conn.cert_reqs = "CERT_NONE"
conn.ca_certs = None
@@ -410,7 +387,7 @@ def build_connection_pool_key_attributes(self, request, verify, cert=None):
``"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
+ by :py:func:`os.path.isdir`, otherwise ``"ca_cert_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
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/requests/compat.py b/addons/source-python/packages/site-packages/pip/_vendor/requests/compat.py
index 7081da756..b95a92140 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/requests/compat.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/requests/compat.py
@@ -9,6 +9,18 @@
import sys
+# -------
+# urllib3
+# -------
+from pip._vendor.urllib3 import __version__ as urllib3_version
+
+# Detect which major version of urllib3 is being used.
+try:
+ is_urllib3_1 = int(urllib3_version.split(".")[0]) == 1
+except (TypeError, AttributeError):
+ # If we can't discern a version, prefer old functionality.
+ is_urllib3_1 = True
+
# -------------------
# Character Detection
# -------------------
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/requests/models.py b/addons/source-python/packages/site-packages/pip/_vendor/requests/models.py
index 85a008cfb..22de95c06 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/requests/models.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/requests/models.py
@@ -945,7 +945,9 @@ def text(self):
return content
def json(self, **kwargs):
- r"""Returns the json-encoded content of a response, if any.
+ r"""Decodes the JSON response body (if any) as a Python object.
+
+ This may return a dictionary, list, etc. depending on what is in the response.
:param \*\*kwargs: Optional arguments that ``json.loads`` takes.
:raises requests.exceptions.JSONDecodeError: If the response body does not
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/requests/sessions.py b/addons/source-python/packages/site-packages/pip/_vendor/requests/sessions.py
index b387bc36d..731550de8 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/requests/sessions.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/requests/sessions.py
@@ -535,7 +535,7 @@ def request(
for multipart encoding upload.
:param auth: (optional) Auth tuple or callable to enable
Basic/Digest/Custom HTTP Auth.
- :param timeout: (optional) How long to wait for the server to send
+ :param timeout: (optional) How many seconds to wait for the server to send
data before giving up, as a float, or a :ref:`(connect timeout,
read timeout) ` tuple.
:type timeout: float or tuple
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/requests/utils.py b/addons/source-python/packages/site-packages/pip/_vendor/requests/utils.py
index a35ce4786..e8ea5ad36 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/requests/utils.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/requests/utils.py
@@ -38,6 +38,7 @@
getproxies,
getproxies_environment,
integer_types,
+ is_urllib3_1,
)
from .compat import parse_http_list as _parse_list_header
from .compat import (
@@ -136,7 +137,9 @@ def super_len(o):
total_length = None
current_position = 0
- if isinstance(o, str):
+ if not is_urllib3_1 and isinstance(o, str):
+ # urllib3 2.x+ treats all strings as utf-8 instead
+ # of latin-1 (iso-8859-1) like http.client.
o = o.encode("utf-8")
if hasattr(o, "__len__"):
@@ -216,14 +219,7 @@ def get_netrc_auth(url, raise_errors=False):
netrc_path = None
for f in netrc_locations:
- try:
- loc = os.path.expanduser(f)
- except KeyError:
- # os.path.expanduser can fail when $HOME is undefined and
- # getpwuid fails. See https://bugs.python.org/issue20164 &
- # https://github.com/psf/requests/issues/1846
- return
-
+ loc = os.path.expanduser(f)
if os.path.exists(loc):
netrc_path = loc
break
@@ -233,13 +229,7 @@ def get_netrc_auth(url, raise_errors=False):
return
ri = urlparse(url)
-
- # Strip port numbers from netloc. This weird `if...encode`` dance is
- # used for Python 3.2, which doesn't support unicode literals.
- splitstr = b":"
- if isinstance(url, str):
- splitstr = splitstr.decode("ascii")
- host = ri.netloc.split(splitstr)[0]
+ host = ri.hostname
try:
_netrc = netrc(netrc_path).authenticators(host)
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/LICENSE b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/LICENSE
new file mode 100644
index 000000000..b9077766e
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2018, Tzu-ping Chung
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/__init__.py
index d92acc7be..4c7f815a8 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/__init__.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/__init__.py
@@ -1,22 +1,23 @@
__all__ = [
- "__version__",
"AbstractProvider",
"AbstractResolver",
"BaseReporter",
"InconsistentCandidate",
- "Resolver",
"RequirementsConflicted",
"ResolutionError",
"ResolutionImpossible",
"ResolutionTooDeep",
+ "Resolver",
+ "__version__",
]
-__version__ = "1.0.1"
+__version__ = "1.2.1"
-from .providers import AbstractProvider, AbstractResolver
+from .providers import AbstractProvider
from .reporters import BaseReporter
from .resolvers import (
+ AbstractResolver,
InconsistentCandidate,
RequirementsConflicted,
ResolutionError,
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/providers.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/providers.py
index e99d87ee7..524e3d832 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/providers.py
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/reporters.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/reporters.py
index 688b5e10d..6c142204b 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/reporters.py
+++ b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/reporters.py
@@ -1,26 +1,36 @@
-class BaseReporter(object):
- """Delegate class to provider progress reporting for the resolver."""
+from __future__ import annotations
- def starting(self):
+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 provide progress reporting for the resolver."""
+
+ 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/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/__init__.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/__init__.py
new file mode 100644
index 000000000..b24922152
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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",
+ "Criterion",
+ "InconsistentCandidate",
+ "RequirementInformation",
+ "RequirementsConflicted",
+ "Resolution",
+ "ResolutionError",
+ "ResolutionImpossible",
+ "ResolutionTooDeep",
+ "Resolver",
+ "ResolverException",
+ "Result",
+]
diff --git a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/abstract.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/abstract.py
new file mode 100644
index 000000000..db32b3b51
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/abstract.py
@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import collections
+from typing import TYPE_CHECKING, Any, Generic, Iterable, 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: dict[KT, CT]
+ graph: DirectedGraph[KT | None]
+ criteria: dict[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/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/criterion.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/criterion.py
new file mode 100644
index 000000000..ee5019ccd
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/exceptions.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/exceptions.py
new file mode 100644
index 000000000..35e275576
--- /dev/null
+++ b/addons/source-python/packages/site-packages/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/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/resolution.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/resolution.py
new file mode 100644
index 000000000..8c13d3b27
--- /dev/null
+++ b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/resolvers/resolution.py
@@ -0,0 +1,627 @@
+from __future__ import annotations
+
+import collections
+import itertools
+import operator
+from typing import TYPE_CHECKING, Generic
+
+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 collections.abc import Collection, Iterable, Mapping
+
+ from ..providers import AbstractProvider, Preference
+ from ..reporters import BaseReporter
+
+_OPTIMISTIC_BACKJUMPING_RATIO: float = 0.1
+
+
+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
+
+ 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)
+
+ return Result(
+ mapping={k: v for k, v in mapping.items() if k in connected},
+ graph=graph,
+ criteria=state.criteria,
+ )
+
+
+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: AbstractProvider[RT, CT, KT],
+ reporter: BaseReporter[RT, CT, KT],
+ ) -> None:
+ self._p = provider
+ self._r = reporter
+ self._states: list[State[RT, CT, KT]] = []
+
+ # Optimistic backjumping variables
+ self._optimistic_backjumping_ratio = _OPTIMISTIC_BACKJUMPING_RATIO
+ self._save_states: list[State[RT, CT, KT]] | None = None
+ self._optimistic_start_round: int | None = None
+
+ @property
+ def state(self) -> State[RT, CT, KT]:
+ try:
+ return self._states[-1]
+ except IndexError as e:
+ raise AttributeError("state") from e
+
+ 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
+ coming round.
+ """
+ base = self._states[-1]
+ state = State(
+ mapping=base.mapping.copy(),
+ criteria=base.criteria.copy(),
+ backtrack_causes=base.backtrack_causes[:],
+ )
+ self._states.append(state)
+
+ 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)
+ criterion = criteria.get(identifier)
+ if criterion:
+ incompatibilities = list(criterion.incompatibilities)
+ else:
+ incompatibilities = []
+
+ matches = self._p.find_matches(
+ identifier=identifier,
+ requirements=IteratorMapping(
+ criteria,
+ operator.methodcaller("iter_requirement"),
+ {identifier: [requirement]},
+ ),
+ incompatibilities=IteratorMapping(
+ criteria,
+ operator.attrgetter("incompatibilities"),
+ {identifier: incompatibilities},
+ ),
+ )
+
+ if criterion:
+ information = list(criterion.information)
+ information.append(RequirementInformation(requirement, parent))
+ else:
+ information = [RequirementInformation(requirement, parent)]
+
+ criterion = Criterion(
+ candidates=build_iter_view(matches),
+ information=information,
+ incompatibilities=incompatibilities,
+ )
+ if not criterion.candidates:
+ raise RequirementsConflicted(criterion)
+ criteria[identifier] = criterion
+
+ 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``
+ field that have one of ``parents`` as provider of the requirement.
+
+ :param criteria: The criteria to update.
+ :param parents: Identifiers for which to remove information from all criteria.
+ """
+ if not parents:
+ return
+ for key, criterion in criteria.items():
+ criteria[key] = Criterion(
+ criterion.candidates,
+ [
+ information
+ for information in criterion.information
+ if (
+ information.parent is None
+ or self._p.identify(information.parent) not in parents
+ )
+ ],
+ criterion.incompatibilities,
+ )
+
+ def _get_preference(self, name: KT) -> Preference:
+ return self._p.get_preference(
+ identifier=name,
+ 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,
+ )
+
+ def _is_current_pin_satisfying(
+ self, name: KT, criterion: Criterion[RT, CT]
+ ) -> bool:
+ try:
+ current_pin = self.state.mapping[name]
+ except KeyError:
+ return False
+ return all(
+ self._p.is_satisfied_by(requirement=r, candidate=current_pin)
+ for r in criterion.iter_requirement()
+ )
+
+ 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: KT) -> list[Criterion[RT, CT]]:
+ criterion = self.state.criteria[name]
+
+ causes: list[Criterion[RT, CT]] = []
+ for candidate in criterion.candidates:
+ try:
+ criteria = self._get_updated_criteria(candidate)
+ except RequirementsConflicted as e:
+ self._r.rejecting_candidate(e.criterion, candidate)
+ causes.append(e.criterion)
+ continue
+
+ # Check the newly-pinned candidate actually works. This should
+ # always pass under normal circumstances, but in the case of a
+ # faulty provider, we will raise an error to notify the implementer
+ # to fix find_matches() and/or is_satisfied_by().
+ satisfied = all(
+ self._p.is_satisfied_by(requirement=r, candidate=candidate)
+ for r in criterion.iter_requirement()
+ )
+ if not satisfied:
+ raise InconsistentCandidate(candidate, criterion)
+
+ self._r.pinning(candidate=candidate)
+ self.state.criteria.update(criteria)
+
+ # Put newly-pinned candidate at the end. This is essential because
+ # backtracking looks at this mapping to get the last pin.
+ self.state.mapping.pop(name, None)
+ self.state.mapping[name] = candidate
+
+ return []
+
+ # All candidates tried, nothing works. This criterion is a dead
+ # end, signal for backtracking.
+ return 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 _save_state(self) -> None:
+ """Save states for potential rollback if optimistic backjumping fails."""
+ if self._save_states is None:
+ self._save_states = [
+ State(
+ mapping=s.mapping.copy(),
+ criteria=s.criteria.copy(),
+ backtrack_causes=s.backtrack_causes[:],
+ )
+ for s in self._states
+ ]
+
+ def _rollback_states(self) -> None:
+ """Rollback states and disable optimistic backjumping."""
+ self._optimistic_backjumping_ratio = 0.0
+ if self._save_states:
+ self._states = self._save_states
+ self._save_states = None
+
+ def _backjump(self, causes: list[RequirementInformation[RT, CT]]) -> bool:
+ """Perform backjumping.
+
+ When we enter here, the stack is like this::
+
+ [ state Z ]
+ [ state Y ]
+ [ state X ]
+ .... earlier states are irrelevant.
+
+ 1. No pins worked for Z, so it does not have a pin.
+ 2. We want to reset state Y to unpinned, and pin another candidate.
+ 3. State X holds what state Y was before the pin, but does not
+ have the incompatibility information gathered in state Y.
+
+ Each iteration of the loop will:
+
+ 1. Identify Z. The incompatibility is not always caused by the latest
+ state. For example, given three requirements A, B and C, with
+ dependencies A1, B1 and C1, where A1 and B1 are incompatible: the
+ last state might be related to C, so we want to discard the
+ previous state.
+ 2. Discard Z.
+ 3. Discard Y but remember its incompatibility information gathered
+ previously, and the failure we're dealing with right now.
+ 4. Push a new state Y' based on X, and apply the incompatibility
+ information from Y to Y'.
+ 5a. If this causes Y' to conflict, we need to backtrack again. Make Y'
+ the new Z and go back to step 2.
+ 5b. If the incompatibilities apply cleanly, end backtracking.
+ """
+ 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),
+ )
+ incompatible_deps = {self._p.identify(r) for r in incompatible_reqs}
+ while len(self._states) >= 3:
+ # Remove the state that triggered backtracking.
+ del self._states[-1]
+
+ # 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) from None
+
+ if (
+ not self._optimistic_backjumping_ratio
+ and name not in incompatible_deps
+ ):
+ # For safe backjumping only backjump if the current dependency
+ # is not the same as the incompatible dependency
+ break
+
+ # On the first time a non-safe backjump is done the state
+ # is saved so we can restore it later if the resolution fails
+ if (
+ self._optimistic_backjumping_ratio
+ and self._save_states is None
+ and name not in incompatible_deps
+ ):
+ self._save_state()
+
+ # If the current dependencies and the incompatible dependencies
+ # are overlapping then we have likely found a cause of the
+ # incompatibility
+ current_dependencies = {
+ self._p.identify(d) for d in self._p.get_dependencies(candidate)
+ }
+ 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
+
+ # Guard: We need at least two state to remain to both
+ # backtrack and push a new state
+ if len(self._states) <= 1:
+ raise ResolutionImpossible(causes)
+
+ incompatibilities_from_broken = [
+ (k, list(v.incompatibilities)) for k, v in broken_state.criteria.items()
+ ]
+
+ # Also mark the newly known incompatibility.
+ incompatibilities_from_broken.append((name, [candidate]))
+
+ self._push_new_state()
+ success = self._patch_criteria(incompatibilities_from_broken)
+
+ # It works! Let's work on this new state.
+ if success:
+ return True
+
+ # State does not work after applying known incompatibilities.
+ # Try the still previous state.
+
+ # No way to backtrack anymore.
+ return False
+
+ 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")
+
+ self._r.starting()
+
+ # Initialize the root state.
+ self._states = [
+ State(
+ mapping=collections.OrderedDict(),
+ criteria={},
+ backtrack_causes=[],
+ )
+ ]
+ for r in requirements:
+ try:
+ self._add_to_criteria(self.state.criteria, r, parent=None)
+ except RequirementsConflicted as e:
+ 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
+ # pinning the virtual "root" package in the graph.
+ self._push_new_state()
+
+ # Variables for optimistic backjumping
+ optimistic_rounds_cutoff: int | None = None
+ optimistic_backjumping_start_round: int | None = None
+
+ for round_index in range(max_rounds):
+ self._r.starting_round(index=round_index)
+
+ # Handle if optimistic backjumping has been running for too long
+ if self._optimistic_backjumping_ratio and self._save_states is not None:
+ if optimistic_backjumping_start_round is None:
+ optimistic_backjumping_start_round = round_index
+ optimistic_rounds_cutoff = int(
+ (max_rounds - round_index) * self._optimistic_backjumping_ratio
+ )
+
+ if optimistic_rounds_cutoff <= 0:
+ self._rollback_states()
+ continue
+ elif optimistic_rounds_cutoff is not None:
+ if (
+ round_index - optimistic_backjumping_start_round
+ >= optimistic_rounds_cutoff
+ ):
+ self._rollback_states()
+ continue
+
+ unsatisfied_names = [
+ key
+ for key, criterion in self.state.criteria.items()
+ if not self._is_current_pin_satisfying(key, criterion)
+ ]
+
+ # All criteria are accounted for. Nothing more to pin, we are done!
+ if not unsatisfied_names:
+ self._r.ending(state=self.state)
+ return self.state
+
+ # keep track of satisfied names to calculate diff after pinning
+ 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")
+
+ # 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]
+
+ 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)
+
+ try:
+ success = self._backjump(causes)
+ except ResolutionImpossible:
+ if self._optimistic_backjumping_ratio and self._save_states:
+ failed_optimistic_backjumping = True
+ else:
+ raise
+ else:
+ failed_optimistic_backjumping = bool(
+ not success
+ and self._optimistic_backjumping_ratio
+ and self._save_states
+ )
+
+ if failed_optimistic_backjumping and self._save_states:
+ self._rollback_states()
+ else:
+ self.state.backtrack_causes[:] = causes
+
+ # Dead ends everywhere. Give up.
+ if not success:
+ raise ResolutionImpossible(self.state.backtrack_causes)
+ else:
+ # discard as information sources any invalidated names
+ # (unsatisfied names that were previously satisfied)
+ newly_unsatisfied_names = {
+ key
+ for key, criterion in self.state.criteria.items()
+ if key in satisfied_names
+ and not self._is_current_pin_satisfying(key, criterion)
+ }
+ self._remove_information_from_criteria(
+ self.state.criteria, newly_unsatisfied_names
+ )
+ # Pinning was successful. Push a new state to do another pin.
+ self._push_new_state()
+
+ self._r.ending_round(index=round_index, state=self.state)
+
+ raise ResolutionTooDeep(max_rounds)
+
+
+class Resolver(AbstractResolver[RT, CT, KT]):
+ """The thing that performs the actual resolution work."""
+
+ base_exception = ResolverException
+
+ 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
+ is a tuple subclass with three public members:
+
+ * `mapping`: A dict of resolved candidates. Each key is an identifier
+ of a requirement (as returned by the provider's `identify` method),
+ and the value is the resolved candidate.
+ * `graph`: A `DirectedGraph` instance representing the dependency tree.
+ The vertices are keys of `mapping`, and each edge represents *why*
+ a particular package is included. A special vertex `None` is
+ included to represent parents of user-supplied requirements.
+ * `criteria`: A dict of "criteria" that hold detailed information on
+ how edges in the graph are derived. Each key is an identifier of a
+ requirement, and the value is a `Criterion` instance.
+
+ The following exceptions may be raised if a resolution cannot be found:
+
+ * `ResolutionImpossible`: A resolution cannot be found for the given
+ combination of requirements. The `causes` attribute of the
+ exception is a list of (requirement, parent), giving the
+ requirements that could not be satisfied.
+ * `ResolutionTooDeep`: The dependency tree is too deeply nested and
+ the resolver gave up. This is usually caused by a circular
+ dependency, but you can try to resolve this by increasing the
+ `max_rounds` argument.
+ """
+ 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/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/structs.py b/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/structs.py
index 359a34f60..18c74d415 100644
--- a/addons/source-python/packages/site-packages/pip/_vendor/resolvelib/structs.py
+++ b/addons/source-python/packages/site-packages/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[