Fix existing tests.

Author: domdfcoding

dep_checker/__main__.py

@@ -36,11 +36,10 @@
 from consolekit import click_command
 from consolekit.options import auto_default_option, colour_option, flag_option
 from consolekit.utils import abort
-
-# this package
 from domdf_python_tools.paths import PathPlus
 from shippinglabel.requirements import parse_pyproject_dependencies, read_requirements
 
+# this package
 from dep_checker import check_imports
 
 __all__ = ("main", )
@@ -67,11 +66,7 @@
 		metavar="FILENAME",
 		help="Parse the requirements from the given requirements file.",
 		)
-@flag_option(
-		"-P", "--pyproject",
-		type=click.STRING,
-		help="Parse the requirements from 'pyproject.toml'.",
-		)
+@flag_option("-P", "--pyproject", help="Parse the requirements from 'pyproject.toml'.", default=False,)
 @click.argument(
 		"pkg-name",
 		type=click.STRING,
@@ -92,22 +87,22 @@ def main(
 	if allowed_unused == ():
 		allowed_unused = None
 
-	work_dir = PathPlus(work_dir)
+	work_dir_p = PathPlus(work_dir)
 
 	def read_req_file(req_file):
 		req_file = PathPlus(req_file)
 
 		if not req_file.is_absolute():
-			req_file = work_dir / req_file
+			req_file = work_dir_p / req_file
 
 		return read_requirements(req_file)[0]
 
 	if pyproject:
-		pyproject_file = work_dir / "pyproject.toml"
+		pyproject_file = work_dir_p / "pyproject.toml"
 		dynamic = dom_toml.load(pyproject_file)["project"].get("dynamic", ())
 
 		if "requirements" in dynamic:
-			requirements = read_req_file(work_dir / "requirements.txt")
+			requirements = read_req_file(work_dir_p / "requirements.txt")
 		else:
 			requirements = parse_pyproject_dependencies(pyproject_file, flavour="pep621")
 
@@ -120,7 +115,7 @@ def read_req_file(req_file):
 				*requirements,
 				allowed_unused=allowed_unused,
 				colour=colour,
-				work_dir=work_dir,
+				work_dir=work_dir_p,
 				)
 		sys.exit(ret)
 	except FileNotFoundError as e:

requirements.txt

@@ -4,4 +4,5 @@ configconfig>=0.4.0
 consolekit>=0.4.0
 dom-toml>=0.2.0
 domdf-python-tools>=3.2.0
+packaging>=25.0
 shippinglabel>=0.1.0

tests/test_dep_checker.py

@@ -1,7 +1,8 @@
 # stdlib
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 # 3rd party
+from packaging.requirements import Requirement
 import pytest
 from coincidence import AdvancedDataRegressionFixture
 from consolekit.testing import CliRunner, Result
@@ -22,19 +23,21 @@
 def test_check_imports(
 		single_file_project: PathPlus,
 		capsys,
+		requirements: List[str],
 		advanced_data_regression: AdvancedDataRegressionFixture,
 		):
-	assert check_imports("my_project", work_dir=single_file_project, colour=False) == 1
+	assert check_imports("my_project", *map(Requirement, requirements), work_dir=single_file_project, colour=False) == 1
 	advanced_data_regression.check(capsys.readouterr())
 
 
 def test_check_imports_package(
 		package_project: PathPlus,
 		capsys,
+		requirements: List[str],
 		advanced_data_regression: AdvancedDataRegressionFixture,
 		):
 
-	assert check_imports("my_project", work_dir=package_project, colour=False) == 1
+	assert check_imports("my_project", *map(Requirement, requirements), work_dir=package_project, colour=False) == 1
 	advanced_data_regression.check(capsys.readouterr())
 
 
@@ -96,9 +99,11 @@ def test_with_config(
 		capsys,
 		advanced_data_regression: AdvancedDataRegressionFixture,
 		config: Dict[str, Any],
+		requirements: List[str],
 		):
 	assert check_imports(
 			"my_project",
+			*map(Requirement, requirements),
 			work_dir=single_file_project,
 			colour=False,
 			**config,