migrate from blackt to ruff format + bump deps

Author: FredHappyface

.pre-commit-config.yaml

@@ -1,22 +1,18 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.14
+    rev: v0.2.2
     hooks:
       - id: ruff
         args: [ --fix ]
+      - id: ruff-format
 
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.347
+    rev: v1.1.351
     hooks:
     - id: pyright
 
-  - repo: https://github.com/FHPythonUtils/Blackt
-    rev: '2024.0.1'
-    hooks:
-      - id: blackt
-
   - repo: https://github.com/Lucas-C/pre-commit-hooks-safety
-    rev: v1.3.2
+    rev: v1.3.3
     hooks:
     -   id: python-safety-dependencies-check
         files: pyproject.toml
@@ -39,7 +35,7 @@ repos:
       - id: mixed-line-ending
 
   - repo: https://github.com/boidolr/pre-commit-images
-    rev: v1.5.1
+    rev: v1.5.2
     hooks:
       - id: optimize-jpg
       - id: optimize-png

licensecheck/formatter.py

@@ -51,6 +51,7 @@ def stripAnsi(string: str) -> str:
 	Returns:
 	-------
 		str: plaintext, utf-8 string (safe for writing to files)
+
 	"""
 	return re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])").sub("", string)
 
@@ -66,6 +67,7 @@ def ansi(myLice: License, packages: list[PackageInfo]) -> str:
 	Returns:
 	-------
 		str: string to send to specified output in ansi format
+
 	"""
 	string = StringIO()
 
@@ -113,6 +115,7 @@ def plainText(myLice: License, packages: list[PackageInfo]) -> str:
 	Returns:
 	-------
 		str: string to send to specified output in plain text format
+
 	"""
 	return stripAnsi(ansi(myLice, packages))
 
@@ -128,6 +131,7 @@ def markdown(myLice: License, packages: list[PackageInfo]) -> str:
 	Returns:
 	-------
 		str: string to send to specified output in markdown format
+
 	"""
 	info = "\n".join(f"- **{k}**: {v}" for k, v in INFO.items())
 	strBuf = [f"## Info\n\n{info}\n\n## Project License\n\n{printLicense(myLice)}\n"]
@@ -169,6 +173,7 @@ def raw(myLice: License, packages: list[PackageInfo]) -> str:
 	Returns:
 	-------
 		str: string to send to specified output in raw json format
+
 	"""
 	return json.dumps(
 		{
@@ -191,6 +196,7 @@ def rawCsv(myLice: License, packages: list[PackageInfo]) -> str:
 	Returns:
 	-------
 		str: string to send to specified output in raw csv format
+
 	"""
 	_ = myLice
 	string = StringIO()

licensecheck/get_deps.py

@@ -36,6 +36,7 @@ def getReqs(using: str, skipDependencies: list[ucstr]) -> set[ucstr]:
 	Returns:
 	-------
 		set[str]: set of requirement packages
+
 	"""
 
 	_ = using.split(":", 1)
@@ -194,6 +195,7 @@ def getDepsWithLicenses(
 		tuple[License, set[PackageInfo]]: tuple of
 			my package license
 			set of updated dependencies with licenseCompat set
+
 	"""
 	reqs = getReqs(using, skipDependencies)
 

licensecheck/license_matrix.py

@@ -62,6 +62,7 @@ def licenseLookup(licenseStr: ucstr, ignoreLicenses: list[ucstr] | None = None)
 	Returns:
 	-------
 		L: License represented by licenseStr
+
 	"""
 	termToLicense = {
 		"PUBLIC DOMAIN": L.PUBLIC,
@@ -124,6 +125,7 @@ def licenseType(lice: ucstr, ignoreLicenses: list[ucstr] | None = None) -> list[
 	Returns:
 	-------
 		list[L]: the license
+
 	"""
 	if len(lice or "") < 1:
 		return [L.NO_LICENSE]
@@ -148,6 +150,7 @@ def depCompatWMyLice(
 	Returns:
 	-------
 		bool: True if compatible, otherwise False
+
 	"""
 
 	# Protect against None

licensecheck/packageinfo.py

@@ -93,6 +93,7 @@ def licenseFromClassifierlist(classifiers: list[str] | None | list[Any]) -> ucst
 	Returns:
 	-------
 		str: the license name
+
 	"""
 	if not classifiers:
 		return UNKNOWN
@@ -116,6 +117,7 @@ def getPackages(reqs: set[ucstr]) -> set[PackageInfo]:
 	Returns:
 	-------
 		set[PackageInfo]: set of dependencies
+
 	"""
 	packageinfo = set()
 	for requirement in reqs:
@@ -136,6 +138,7 @@ def getMyPackageMetadata() -> dict[str, Any]:
 	Returns
 	-------
 		dict[str, Any]: {"classifiers": list[str], "license": ucstr}
+
 	"""
 	if Path("setup.cfg").exists():
 		config = configparser.ConfigParser()
@@ -161,6 +164,7 @@ def getMyPackageLicense() -> ucstr:
 	Returns
 	-------
 		str: license name
+
 	"""
 	metaData = getMyPackageMetadata()
 	licenseClassifier = licenseFromClassifierlist(metaData.get("classifiers", []))
@@ -184,6 +188,7 @@ def getModuleSize(path: Path, name: ucstr) -> int:
 	Returns:
 	-------
 		int: size in bytes
+
 	"""
 	size = 0
 	with contextlib.suppress(AttributeError):

pyproject.toml

@@ -29,20 +29,19 @@ licensecheck = 'licensecheck:cli'
 [tool.poetry.dependencies]
 python = "^3.8"
 requests = "<3,>=2.31.0"
-fhconfparser = "<2025,>=2023"
+fhconfparser = "<2026,>=2024.1"
 tomli = "<3,>=2.0.1"
 rich = "<14,>=13.7.0"
-requests-cache = "<2,>=1.1.1"
+requests-cache = "<2,>=1.2.0"
 packaging = "<24,>=23.2"
 loguru = "<2,>=0.7.2"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.4"
+pytest = "^8.0.2"
 handsdown = "^2.1.0"
-coverage = "^7.4.0"
+coverage = "^7.4.3"
 ruff = "^0.1.13"
-blackt = "^2024.0.1"
-pyright = "^1.1.347"
+pyright = "^1.1.351"
 pytest-loguru = "^0.3.0"
 
 [build-system]
@@ -73,9 +72,11 @@ fixable = ["ALL"]
 [tool.ruff.lint.per-file-ignores]
 "**/{tests,docs,tools}/*" = ["D", "S101", "E402"]
 
-[tool.black]
-line-length = 100
-target-version = ["py38"]
+[tool.ruff.format]
+indent-style = "tab"
+docstring-code-format = true
+line-ending = "lf"
+
 
 [tool.pyright]
 venvPath = "."

requirements.txt

@@ -1,7 +1,7 @@
-fhconfparser<2025,>=2023
+fhconfparser<2026,>=2024.1
 loguru<2,>=0.7.2
 packaging<24,>=23.2
-requests-cache<2,>=1.1.1
+requests-cache<2,>=1.2.0
 requests<3,>=2.31.0
 rich<14,>=13.7.0
 tomli<3,>=2.0.1