Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

fix: fix return type hint for dedupe() #90

Merged
merged 4 commits into from
May 14, 2024
Merged

fix: fix return type hint for dedupe() #90

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caccc08
fix: fix return type hint for dedupe()
jameslamb May 13, 2024
ddb8c7f
use Sequence
jameslamb May 13, 2024
f9e3b63
use typing.Union instead of pipe
jameslamb May 14, 2024
72934d6
Merge branch 'main' into mypy/dedupe
jameslamb May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions src/rapids_dependency_file_generator/_rapids_dependency_file_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import os
import textwrap
import typing
from collections import defaultdict
from collections.abc import Generator

import tomlkit
Expand Down Expand Up @@ -42,7 +41,7 @@ def delete_existing_files(root: os.PathLike) -> None:

def dedupe(
dependencies: list[typing.Union[str, _config.PipRequirements]],
) -> list[typing.Union[str, dict[str, str]]]:
) -> list[typing.Union[str, dict[str, list[str]]]]:
"""Generate the unique set of dependencies contained in a dependency list.

Parameters
Expand All @@ -52,18 +51,21 @@ def dedupe(

Returns
-------
list[str | dict[str, str]]
The `dependencies` with all duplicates removed.
list[str | dict[str, list[str]]]
The ``dependencies`` with all duplicates removed.
"""
deduped = sorted({dep for dep in dependencies if isinstance(dep, str)})
dict_deps = defaultdict(list)
for dep in filter(lambda dep: not isinstance(dep, str), dependencies):
if isinstance(dep, _config.PipRequirements):
dict_deps["pip"].extend(dep.pip)
dict_deps["pip"] = sorted(set(dict_deps["pip"]))
if dict_deps:
deduped.append(dict(dict_deps))
return deduped
string_deps: set[str] = set()
pip_deps: set[str] = set()
for dep in dependencies:
if isinstance(dep, str):
string_deps.add(dep)
elif isinstance(dep, _config.PipRequirements):
pip_deps.update(dep.pip)

if pip_deps:
return [*sorted(string_deps), {"pip": sorted(pip_deps)}]
else:
return sorted(string_deps) # type: ignore[return-value]
jameslamb marked this conversation as resolved.
Show resolved Hide resolved


def grid(gridspec: dict[str, list[str]]) -> Generator[dict[str, str]]:
Expand Down
11 changes: 10 additions & 1 deletion tests/test_rapids_dependency_file_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_dedupe():
deduped = dedupe(["dep1", "dep1", "dep2"])
assert deduped == ["dep1", "dep2"]

# list w/ pip dependencies
# list w/ mix of simple and pip dependencies
deduped = dedupe(
[
"dep1",
Expand All @@ -30,6 +30,15 @@ def test_dedupe():
)
assert deduped == ["dep1", {"pip": ["pip_dep1", "pip_dep2"]}]

# list w/ only pip dependencies
deduped = dedupe(
[
_config.PipRequirements(pip=["pip_dep1", "pip_dep2"]),
_config.PipRequirements(pip=["pip_dep3", "pip_dep1"]),
]
)
assert deduped == [{"pip": ["pip_dep1", "pip_dep2", "pip_dep3"]}]


@mock.patch(
"rapids_dependency_file_generator._rapids_dependency_file_generator.os.path.relpath"
Expand Down
Loading