Skip to content

Commit

Permalink
Enforce ruff/pyupgrade rules (UP) (#12936)
Browse files Browse the repository at this point in the history
  • Loading branch information
DimitriPapadopoulos authored Sep 16, 2024
1 parent 111eed1 commit 102d818
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ select = [
"PLR0",
"W",
"RUF100",
"UP032",
"UP",
]

[tool.ruff.lint.isort]
Expand Down
2 changes: 1 addition & 1 deletion src/pip/_internal/cli/index_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class SessionCommandMixin(CommandContextMixIn):

def __init__(self) -> None:
super().__init__()
self._session: Optional["PipSession"] = None
self._session: Optional[PipSession] = None

@classmethod
def _get_index_urls(cls, options: Values) -> Optional[List[str]]:
Expand Down
2 changes: 1 addition & 1 deletion src/pip/_internal/commands/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def run(self, options: Values, args: List[str]) -> int:
if options.excludes:
skip.update(canonicalize_name(n) for n in options.excludes)

packages: "_ProcessedDists" = [
packages: _ProcessedDists = [
cast("_DistWithLatestInfo", d)
for d in get_environment(options.path).iter_installed_distributions(
local_only=options.local,
Expand Down
2 changes: 1 addition & 1 deletion src/pip/_internal/commands/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def transform_hits(hits: List[Dict[str, str]]) -> List["TransformedHit"]:
packages with the list of versions stored inline. This converts the
list from pypi into one we can use.
"""
packages: Dict[str, "TransformedHit"] = OrderedDict()
packages: Dict[str, TransformedHit] = OrderedDict()
for hit in hits:
name = hit["name"]
summary = hit["summary"]
Expand Down
2 changes: 1 addition & 1 deletion src/pip/_internal/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ class HashErrors(InstallationError):
"""Multiple HashError instances rolled into one for reporting"""

def __init__(self) -> None:
self.errors: List["HashError"] = []
self.errors: List[HashError] = []

def append(self, error: "HashError") -> None:
self.errors.append(error)
Expand Down
2 changes: 1 addition & 1 deletion src/pip/_internal/req/constructors.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
assert (
pre is not None and post is not None
), f"regex group selection for requirement {req} failed, this should never happen"
extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else ""
extras: str = "[{}]".format(",".join(sorted(new_extras)) if new_extras else "")
return get_requirement(f"{pre}{extras}{post}")


Expand Down
6 changes: 3 additions & 3 deletions tests/functional/test_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def test_pypi_xml_transformation() -> None:
"version": "1.0",
},
]
expected: List["TransformedHit"] = [
expected: List[TransformedHit] = [
{
"versions": ["1.0", "2.0"],
"name": "foo",
Expand Down Expand Up @@ -159,7 +159,7 @@ def test_latest_prerelease_install_message(
"""
Test documentation for installing pre-release packages is displayed
"""
hits: List["TransformedHit"] = [
hits: List[TransformedHit] = [
{
"name": "ni",
"summary": "For knights who say Ni!",
Expand Down Expand Up @@ -188,7 +188,7 @@ def test_search_print_results_should_contain_latest_versions(
"""
Test that printed search results contain the latest package versions
"""
hits: List["TransformedHit"] = [
hits: List[TransformedHit] = [
{
"name": "testlib1",
"summary": "Test library 1.",
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/resolution_resolvelib/test_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def build_requirement_information(
install_requirement = install_req_from_req_string(name)
# RequirementInformation is typed as a tuple, but it is a namedtupled.
# https://github.com/sarugaku/resolvelib/blob/7bc025aa2a4e979597c438ad7b17d2e8a08a364e/src/resolvelib/resolvers.pyi#L20-L22
requirement_information: "PreferenceInformation" = RequirementInformation(
requirement_information: PreferenceInformation = RequirementInformation(
requirement=SpecifierRequirement(install_requirement), # type: ignore[call-arg]
parent=parent,
)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/resolution_resolvelib/test_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def _make_graph(
) -> "DirectedGraph[Optional[str]]":
"""Build graph from edge declarations."""

graph: "DirectedGraph[Optional[str]]" = DirectedGraph()
graph: DirectedGraph[Optional[str]] = DirectedGraph()
for parent, child in edges:
parent = cast(str, canonicalize_name(parent)) if parent else None
child = cast(str, canonicalize_name(child)) if child else None
Expand Down

0 comments on commit 102d818

Please sign in to comment.