Skip to content

Commit b222e74

Browse files
committed
Treat 'requirements_filename' as a Path, not a str
1 parent ab29a55 commit b222e74

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

pip_check_reqs/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ def find_required_modules(
159159
[Union[str, ParsedRequirement]], bool
160160
],
161161
skip_incompatible: bool,
162-
requirements_filename: str,
162+
requirements_filename: Path,
163163
) -> Set[NormalizedName]:
164164
explicit = set()
165165
for requirement in parse_requirements(
166-
requirements_filename, session=PipSession()
166+
str(requirements_filename), session=PipSession()
167167
):
168168
requirement_name = install_req_from_line(
169169
requirement.requirement,

pip_check_reqs/find_extra_reqs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
def find_extra_reqs(
23-
requirements_filename: str,
23+
requirements_filename: Path,
2424
paths: Iterable[Path],
2525
ignore_files_function: Callable[[str], bool],
2626
ignore_modules_function: Callable[[str], bool],
@@ -113,8 +113,9 @@ def main(arguments: Optional[List[str]] = None) -> None:
113113
parser.add_argument(
114114
"--requirements-file",
115115
dest="requirements_filename",
116+
type=Path,
116117
metavar="PATH",
117-
default="requirements.txt",
118+
default=Path("requirements.txt"),
118119
help="path to the requirements file "
119120
'(defaults to "requirements.txt")',
120121
)

pip_check_reqs/find_missing_reqs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
def find_missing_reqs(
25-
requirements_filename: str,
25+
requirements_filename: Path,
2626
paths: Iterable[Path],
2727
ignore_files_function: Callable[[str], bool],
2828
ignore_modules_function: Callable[[str], bool],
@@ -95,7 +95,7 @@ def find_missing_reqs(
9595
# 4. compare with requirements
9696
explicit = set()
9797
for requirement in parse_requirements(
98-
requirements_filename,
98+
str(requirements_filename),
9999
session=PipSession(),
100100
):
101101
requirement_name = install_req_from_line(
@@ -118,6 +118,7 @@ def main(arguments: Optional[List[str]] = None) -> None:
118118
"--requirements-file",
119119
dest="requirements_filename",
120120
metavar="PATH",
121+
type=Path,
121122
default="requirements.txt",
122123
help="path to the requirements file "
123124
'(defaults to "requirements.txt")',

tests/test_common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def test_find_required_modules(tmp_path: Path) -> None:
204204
reqs = common.find_required_modules(
205205
ignore_requirements_function=common.ignorer(ignore_cfg=["barfoo"]),
206206
skip_incompatible=False,
207-
requirements_filename=str(fake_requirements_file),
207+
requirements_filename=fake_requirements_file,
208208
)
209209
assert reqs == {"foobar"}
210210

@@ -218,7 +218,7 @@ def test_find_required_modules_env_markers(tmp_path: Path) -> None:
218218
reqs = common.find_required_modules(
219219
ignore_requirements_function=common.ignorer(ignore_cfg=[]),
220220
skip_incompatible=True,
221-
requirements_filename=str(fake_requirements_file),
221+
requirements_filename=fake_requirements_file,
222222
)
223223
assert reqs == {"ham", "eggs"}
224224

tests/test_find_extra_reqs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_find_extra_reqs(tmp_path: Path) -> None:
4242
)
4343

4444
result = find_extra_reqs.find_extra_reqs(
45-
requirements_filename=str(fake_requirements_file),
45+
requirements_filename=fake_requirements_file,
4646
paths=[source_dir],
4747
ignore_files_function=common.ignorer(ignore_cfg=[]),
4848
ignore_modules_function=common.ignorer(ignore_cfg=[]),

tests/test_find_missing_reqs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_find_missing_reqs(tmp_path: Path) -> None:
4343
)
4444

4545
result = find_missing_reqs.find_missing_reqs(
46-
requirements_filename=str(fake_requirements_file),
46+
requirements_filename=fake_requirements_file,
4747
paths=[source_dir],
4848
ignore_files_function=common.ignorer(ignore_cfg=[]),
4949
ignore_modules_function=common.ignorer(ignore_cfg=[]),

0 commit comments

Comments
 (0)