update tests, all passing

Author: FredHappyface

licensecheck/cli.py

@@ -32,16 +32,15 @@ def cli() -> None:  # pragma: no cover
 		help=f"Output format. one of: {', '.join(list(formatter.formatMap))}. default=simple",
 	)
 	parser.add_argument(
-		"--deps-file",
-		"-i",
-		"-d",
-		help="Filename to read from (omit for stdin)",
+		"--requirements-paths",
+		"-r",
+		help="Filenames to read from (omit for stdin)",
 		nargs="+",
 	)
 	parser.add_argument(
 		"--groups",
 		"-g",
-		help="Select groups from supported files",
+		help="Select groups/extras from supported files",
 		nargs="+",
 	)
 	parser.add_argument(
@@ -91,7 +90,13 @@ def cli() -> None:  # pragma: no cover
 		action="store_true",
 	)
 	args = vars(parser.parse_args())
-	sysexit(main(args))
+	stdin_path = Path("__stdin__")
+	if stdin:
+		stdin_path.write_text("\n".join(stdin.readlines()), "utf-8")
+	ec = main(args)
+	stdin_path.unlink(missing_ok=True)
+
+	sysexit(ec)
 
 
 def main(args: dict) -> int:
@@ -118,8 +123,8 @@ def main(args: dict) -> int:
 	simpleConf = SimpleConf(configparser, "licensecheck", args)
 
 	# File
-	input_file = (
-		simpleConf.get("deps_file")  or stdin
+	requirements_paths = (
+		simpleConf.get("requirements_paths")  or ["__stdin__"]
 	)
 	output_file = (
 		stdout
@@ -135,7 +140,7 @@ def getFromConfig(key: str) -> list[types.ucstr]:
 		return list(map(types.ucstr, simpleConf.get(key, [])))
 
 	incompatible, depsWithLicenses = get_deps.check(
-		input_file=input_file,
+		requirements_paths=requirements_paths,
 		groups=simpleConf.get("groups", []),
 		this_license=this_license,
 		ignore_packages=getFromConfig("ignore_packages"),

tests/data/pep631_socks/pyproject.toml

@@ -19,20 +19,22 @@ def aux_file(file: str) -> str:
 
 
 test_data = [
-	({"license": "MIT", "file": aux_file("test_main_tc1.txt")}, 0),
+	({"license": "MIT", "file": aux_file("test_main_tc1.txt"), "requirements_paths": ["pyproject.toml"]}, 0),
 	(
 		{
 			"license": "BSD",
 			"file": aux_file("test_main_tc3.txt"),
-			"ignore-packages": ["requests"],
-			"ignore-licenses": ["GPL"],
+			"requirements_paths": ["pyproject.toml"],
+			"ignore_packages": ["requests"],
+			"ignore_licenses": ["GPL"],
 		},
 		0,
 	),
 	(
 		{
 			"license": "GPL",
 			"file": aux_file("test_main_tc4.json"),
+			"requirements_paths": ["pyproject.toml"],
 			"format": "json",
 			"hide_output_parameters": ["size", "version", "namever"],
 		},

tests/test_cli.py

@@ -11,7 +11,7 @@
 def test_doGetReqs_PEP631() -> None:
 	extras = ["socks"]
 	pyproject = tomli.loads((THISDIR / "data/pep631_socks.toml").read_text(encoding="utf-8"))
-	requirementsPaths = []
+	requirementsPaths = [(THISDIR / "data/pep631_socks.toml")]
 	skipDependencies = [types.ucstr("TOSKIP")]
 
 	assert get_deps.get_reqs(skipDependencies, extras, requirementsPaths, pyproject) == {

tests/test_get_reqs.py

@@ -157,6 +157,7 @@ def test_issue_84() -> None:
 		"KOMBU",
 		"PROMPT-TOOLKIT",
 		"PYTZ",
+		"TZDATA",
 		"VINE",
 		"WCWIDTH",
 	}