update myLice logic to be less intertwined

Author: FredHappyface

licensecheck/cli.py

@@ -12,7 +12,7 @@
 
 from fhconfparser import FHConfParser, SimpleConf
 
-from licensecheck import formatter, get_deps, license_matrix, types
+from licensecheck import formatter, get_deps, license_matrix, packageinfo, types
 
 stdout.reconfigure(encoding="utf-8")  # type: ignore[general-type-issues]
 
@@ -116,9 +116,14 @@ def main(args: dict) -> int:
 		else Path(simpleConf.get("file")).open("w", encoding="utf-8")
 	)
 
+	# Get my license
+	myLiceTxt = args["license"] if args.get("license") else packageinfo.getMyPackageLicense()
+	myLice = license_matrix.licenseType(myLiceTxt)[0]
+
 	# Get list of licenses
-	myLice, depsWithLicenses = get_deps.getDepsWithLicenses(
+	depsWithLicenses = get_deps.getDepsWithLicenses(
 		simpleConf.get("using", "poetry"),
+		myLice,
 		list(map(types.ucstr, simpleConf.get("ignore_packages", []))),
 		list(map(types.ucstr, simpleConf.get("fail_packages", []))),
 		list(map(types.ucstr, simpleConf.get("ignore_licenses", []))),
@@ -127,8 +132,6 @@ def main(args: dict) -> int:
 		list(map(types.ucstr, simpleConf.get("skip_dependencies", []))),
 	)
 
-	myLice = license_matrix.licenseType(args["license"])[0] if args.get("license") else myLice
-
 	# Are any licenses incompatible?
 	incompatible = any(not lice.licenseCompat for lice in depsWithLicenses)
 

licensecheck/get_deps.py

@@ -74,18 +74,20 @@ def getReqs(using: str, skipDependencies: list[ucstr]) -> set[ucstr]:
 
 def getDepsWithLicenses(
 	using: str,
+	myLice: License,
 	ignorePackages: list[ucstr],
 	failPackages: list[ucstr],
 	ignoreLicenses: list[ucstr],
 	failLicenses: list[ucstr],
 	onlyLicenses: list[ucstr],
 	skipDependencies: list[ucstr],
-) -> tuple[License, set[PackageInfo]]:
+) -> set[PackageInfo]:
 	"""Get a set of dependencies with licenses and determine license compatibility.
 
 	Args:
 	----
 		using (str): use requirements or poetry
+		myLice (License): user license
 		ignorePackages (list[ucstr]): a list of packages to ignore (compat=True)
 		failPackages (list[ucstr]): a list of packages to fail (compat=False)
 		ignoreLicenses (list[ucstr]): a list of licenses to ignore (skipped, compat may still be
@@ -103,9 +105,6 @@ def getDepsWithLicenses(
 	"""
 	reqs = getReqs(using, skipDependencies)
 
-	# Get my license
-	myLiceTxt = packageinfo.getMyPackageLicense()
-	myLice = license_matrix.licenseType(myLiceTxt)[0]
 	ignoreLicensesType = license_matrix.licenseType(
 		ucstr(JOINS.join(ignoreLicenses)), ignoreLicenses
 	)
@@ -125,7 +124,7 @@ def getDepsWithLicenses(
 			package.licenseCompat = True
 		elif packageName in failPackages:
 			pass  # package.licenseCompat = False
-		# Old behaviour
+		# Else get compat with myLice
 		else:
 			package.licenseCompat = license_matrix.depCompatWMyLice(
 				myLice,
@@ -134,4 +133,4 @@ def getDepsWithLicenses(
 				failLicensesType,
 				onlyLicensesType,
 			)
-	return myLice, packages
+	return packages

tests/data/test_main_tc4_expected.json

@@ -131,7 +131,7 @@
 			"homePage": "https://requests.readthedocs.io",
 			"author": "Kenneth Reitz",
 			"license": "APACHE SOFTWARE LICENSE",
-			"licenseCompat": true,
+			"licenseCompat": false,
 			"errorCode": 0
 		},
 		{
@@ -147,7 +147,7 @@
 			"homePage": "https://github.com/madpah/requirements-parser/#readme",
 			"author": "Paul Horton",
 			"license": "APACHE SOFTWARE LICENSE",
-			"licenseCompat": true,
+			"licenseCompat": false,
 			"errorCode": 0
 		},
 		{
@@ -179,7 +179,7 @@
 			"homePage": "https://github.com/python/typeshed",
 			"author": "UNKNOWN",
 			"license": "APACHE SOFTWARE LICENSE",
-			"licenseCompat": true,
+			"licenseCompat": false,
 			"errorCode": 0
 		},
 		{