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

layeredimage/io/__init__.py

@@ -47,6 +47,7 @@ def openLayerImage(file: str | Path) -> LayeredImage:
 	Returns:
 	-------
 		LayeredImage: a layered image object
+
 	"""
 	functionMap = {
 		".ora": openLayer_ORA,
@@ -87,6 +88,7 @@ def saveLayerImage(fileName: str | Path, layeredImage: LayeredImage) -> None:
 	Returns:
 	-------
 		None
+
 	"""
 	functionMap = {
 		".ora": saveLayer_ORA,

layeredimage/layeredimage.py

@@ -26,6 +26,7 @@ def __init__(
 			layersAndGroups (list[Layer, Group]): List of layers and groups
 			dimensions (tuple[int, int], optional): dimensions of the canvas. Defaults to None.
 			**kwargs (Any): add any keyword args to self.extras
+
 		"""
 		# Write here
 		self.layersAndGroups = layersAndGroups
@@ -145,6 +146,7 @@ def render(layerOrGroup: Layer | Group, project_image: np.ndarray) -> np.ndarray
 	Returns:
 	-------
 		np.ndarray: Flattened image
+
 	"""
 	if isinstance(layerOrGroup, Layer):
 		return blendLayersArray(

layeredimage/layergroup.py

@@ -37,6 +37,7 @@ def __init__(
 			Defaults to True.
 			blendmode (Blendtype): The blending mode to use. Defaults to BlendType.NORMAL
 			**kwargs (Any): add any keyword args to self.extras
+
 		"""
 		self.name = name
 		self.offsets = offsets
@@ -96,6 +97,7 @@ def __init__(
 			is often configured per layer or per group by an 'eye' icon).
 			Defaults to True.
 			blendmode (Blendtype): The blending mode to use. Defaults to BlendType.NORMAL
+
 		"""
 		super().__init__(
 			name, (0, 0), offsets=offsets, opacity=opacity, visible=visible, blendmode=blendmode
@@ -149,6 +151,7 @@ def __init__(
 			is often configured per layer or per group by an 'eye' icon).
 			Defaults to True.
 			blendmode (Blendtype): The blending mode to use. Defaults to BlendType.NORMAL
+
 		"""
 		# Initialise dimens to 0 and then calculate as below
 		super().__init__(

pyproject.toml

@@ -27,19 +27,18 @@ blendmodes = "<2026,>=2024.1"
 pylsr = "<2026,>=2024"
 pyora = "<2,>=0.3.11"
 pypdn = "<2,>=1.0.6"
-psd-tools = "<2,>=1.9.30"
+psd-tools = "<2,>=1.9.31"
 pillow = "<11,>=10.2.0"
 gimpformats = "<2025,>=2023.1"
 loguru = "<2,>=0.7.2"
 
 [tool.poetry.group.dev.dependencies]
 imgcompare = "^2.0.1"
-pytest = "^7.4.4"
+pytest = "^8.0.2"
 handsdown = "^2.1.0"
-coverage = "^7.4.1"
+coverage = "^7.4.3"
 ruff = "^0.1.13"
-blackt = "^2024.0.1"
-pyright = "^1.1.348"
+pyright = "^1.1.351"
 
 [build-system]
 requires = ["poetry-core"]
@@ -67,9 +66,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

@@ -2,7 +2,7 @@ blendmodes<2026,>=2024.1
 gimpformats<2025,>=2023.1
 loguru<2,>=0.7.2
 pillow<11,>=10.2.0
-psd-tools<2,>=1.9.30
+psd-tools<2,>=1.9.31
 pylsr<2026,>=2024
 pyora<2,>=0.3.11
 pypdn<2,>=1.0.6