migrate to uv and update deps

Author: FredHappyface

.github/workflows/test-lint.yaml

@@ -20,6 +20,7 @@ jobs:
           - '3.10'
           - '3.11'
           - '3.12'
+          - '3.13'
 
     steps:
       - name: Checkout code
@@ -30,16 +31,16 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Poetry
+      - name: Install UV
         run: |
-          curl -sSL https://install.python-poetry.org | python3 -
+          curl -LsSf https://astral.sh/uv/install.sh | sh
 
       - name: Install dependencies
-        run: poetry install
+        run: uv sync
 
       - name: Run pytest
-        run: poetry run pytest
+        run: uv run pytest
 
       - name: Run ruff
-        run: poetry run ruff check --output-format=github
+        run: uv run ruff check --output-format=github
         continue-on-error: true

.gitignore

@@ -1,12 +1,7 @@
 !test
-README.rst
-requirements_optional.txt
-tmp
+uv.lock
 profile.*
 
-# DepHell stuff
-poetry.lock
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

.pre-commit-config.yaml

@@ -1,24 +1,46 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.3
+    rev: v0.9.6
     hooks:
       - id: ruff
         args: [ --fix ]
       - id: ruff-format
 
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.354
+    rev: v1.1.394
     hooks:
     - id: pyright
 
-  - repo: https://github.com/Lucas-C/pre-commit-hooks-safety
-    rev: v1.3.3
+  - repo: local
     hooks:
-    -   id: python-safety-dependencies-check
-        files: pyproject.toml
+      - id: generate requirements
+        name: generate requirements
+        entry: uv export --no-hashes --no-dev -o requirements.txt
+        language: system
+        pass_filenames: false
+      - id: safety
+        name: safety
+        entry: uv run safety
+        language: system
+        pass_filenames: false
+      - id: make docs
+        name: make docs
+        entry: uv run handsdown  --cleanup -o documentation/reference
+        language: system
+        pass_filenames: false
+      - id: build package
+        name: build package
+        entry: uv build
+        language: system
+        pass_filenames: false
+      - id: pytest
+        name: pytest
+        entry: uv run pytest
+        language: system
+        pass_filenames: false
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -35,7 +57,7 @@ repos:
       - id: mixed-line-ending
 
   - repo: https://github.com/boidolr/pre-commit-images
-    rev: v1.5.2
+    rev: v1.8.4
     hooks:
       - id: optimize-jpg
       - id: optimize-png

documentation/reference/layeredimage/layeredimage.md

@@ -76,7 +76,7 @@ def addLayerOrGroup(self, layerOrGroup: Layer | Group) -> None: ...
 
 ### LayeredImage().extractGroups
 
-[Show source in layeredimage.py:126](../../../layeredimage/layeredimage.py#L126)
+[Show source in layeredimage.py:127](../../../layeredimage/layeredimage.py#L127)
 
 Extract the groups from the image.
 
@@ -168,7 +168,7 @@ def removeLayerOrGroup(self, index: int) -> None: ...
 
 ### LayeredImage().updateGroups
 
-[Show source in layeredimage.py:134](../../../layeredimage/layeredimage.py#L134)
+[Show source in layeredimage.py:135](../../../layeredimage/layeredimage.py#L135)
 
 Update the groups from the image.
 
@@ -180,7 +180,7 @@ def updateGroups(self) -> None: ...
 
 ### LayeredImage().updateLayers
 
-[Show source in layeredimage.py:122](../../../layeredimage/layeredimage.py#L122)
+[Show source in layeredimage.py:123](../../../layeredimage/layeredimage.py#L123)
 
 Update the layers from the image.
 
@@ -194,7 +194,7 @@ def updateLayers(self) -> None: ...
 
 ## render
 
-[Show source in layeredimage.py:139](../../../layeredimage/layeredimage.py#L139)
+[Show source in layeredimage.py:140](../../../layeredimage/layeredimage.py#L140)
 
 Flatten a layer or group on to an image of what has already been flattened.
 

layeredimage/io/layered.py

@@ -83,7 +83,7 @@ def grabLayer_LAYERED(
 	zipFile: ZipFile, layer: dict[str, Any], blendLookup: dict[str, Any]
 ) -> Layer:
 	"""Grab an image from .layered."""
-	with zipFile.open(f'data/{layer["name"]}.png') as layerImage:
+	with zipFile.open(f"data/{layer['name']}.png") as layerImage:
 		image = Image.open(layerImage).convert("RGBA")
 	return Layer(
 		name=layer["name"],

layeredimage/layeredimage.py

@@ -99,9 +99,8 @@ def extractLayers(self) -> list[Layer]:
 			if isinstance(layerOrGroup, Layer):
 				layers.append(layerOrGroup)
 			else:
-				for layer in layerOrGroup.layers:
-					# Render the layer
-					layers.append(
+				layers.extend(
+					[
 						Layer(
 							name=layer.name,
 							image=layer.image,
@@ -116,7 +115,9 @@ def extractLayers(self) -> list[Layer]:
 							opacity=layerOrGroup.opacity * layer.opacity,
 							visible=layerOrGroup.visible and layer.visible,
 						)
-					)
+						for layer in layerOrGroup.layers
+					]
+				)
 		return layers
 
 	def updateLayers(self) -> None:
@@ -150,6 +151,9 @@ def render(layerOrGroup: Layer | Group, project_image: np.ndarray) -> np.ndarray
 		np.ndarray: Flattened image
 
 	"""
+	if not layerOrGroup.visible:
+		return project_image
+
 	if isinstance(layerOrGroup, Layer):
 		return blendLayersArray(
 			project_image,

pyproject.toml

@@ -1,48 +1,48 @@
-[tool.poetry]
+[project]
 name = "layeredimage"
-version = "2024.3"
-license = "mit"
+version = "2025"
 description = "Use this module to read, and write to a number of layered image formats"
-authors = ["FredHappyface"]
+authors = [{ name = "FredHappyface" }]
+requires-python = ">=3.9,<4.0"
+readme = "README.md"
+license = "mit"
 classifiers = [
-	"Environment :: Console",
-	"Development Status :: 5 - Production/Stable",
-	"Intended Audience :: Developers",
-	"Intended Audience :: Education",
-	"Natural Language :: English",
-	"Operating System :: OS Independent",
-	"Programming Language :: Python :: Implementation :: CPython",
-	"Topic :: Multimedia :: Graphics",
-	"Topic :: Software Development :: Libraries :: Python Modules",
-	"Topic :: Utilities",
+    "Environment :: Console",
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Education",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Multimedia :: Graphics",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Utilities",
+]
+dependencies = [
+    "blendmodes>=2025",
+    "gimpformats>=2025",
+    "loguru>=0.7.3",
+    "pillow>=10.4.0",
+    "psd-tools>=1.10.6",
+    "pylsr>=2024",
+    "pyora>=0.3.11",
+    "pypdn>=1.0.6",
 ]
-homepage = "https://github.com/FHPythonUtils/LayeredImage"
-repository = "https://github.com/FHPythonUtils/LayeredImage"
-documentation = "https://github.com/FHPythonUtils/LayeredImage/blob/master/README.md"
-readme = "README.md"
-
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0"
-blendmodes = "<2026,>=2024.1.1"
-pylsr = "<2026,>=2024"
-pyora = "<2,>=0.3.11"
-pypdn = "<2,>=1.0.6"
-psd-tools = "<2,>=1.9.31"
-pillow = "<11,>=10.2.0"
-gimpformats = "<2026,>=2024"
-loguru = "<2,>=0.7.2"
 
-[tool.poetry.group.dev.dependencies]
-imgcompare = "^2.0.1"
-pytest = "^8.1.1"
-handsdown = "^2.1.0"
-coverage = "^7.4.4"
-ruff = "^0.3.3"
-pyright = "^1.1.354"
+[project.urls]
+Homepage = "https://github.com/FHPythonUtils/LayeredImage"
+Repository = "https://github.com/FHPythonUtils/LayeredImage"
+Documentation = "https://github.com/FHPythonUtils/LayeredImage/blob/master/README.md"
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+[dependency-groups]
+dev = [
+    "coverage>=7.6.12",
+    "handsdown>=2.1.0",
+    "imgcompare>=2.0.1",
+    "pyright>=1.1.394",
+    "pytest>=8.3.4",
+    "ruff>=0.9.7",
+]
 
 [tool.ruff]
 line-length = 100
@@ -52,7 +52,6 @@ target-version = "py38"
 [tool.ruff.lint]
 select = ["ALL"]
 ignore = [
-	"ANN101",  # type annotation for self in method
 	"COM812",  # enforce trailing comma
 	"D2",  # pydocstyle formatting
 	"ISC001",
@@ -96,3 +95,7 @@ deps =
 	pytest
 commands = pytest tests
 """
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"

requirements.txt

@@ -1,8 +1,34 @@
-blendmodes<2026,>=2024.1.1
-gimpformats<2026,>=2024
-loguru<2,>=0.7.2
-pillow<11,>=10.2.0
-psd-tools<2,>=1.9.31
-pylsr<2026,>=2024
-pyora<2,>=0.3.11
-pypdn<2,>=1.0.6
+# This file was autogenerated by uv via the following command:
+#    uv export --no-hashes --no-dev -o requirements.txt
+-e .
+aenum==3.1.15
+aggdraw==1.3.19
+attrs==25.1.0
+blendmodes==2025
+brackettree==0.2.5
+colorama==0.4.6 ; sys_platform == 'win32'
+defusedxml==0.7.1
+deprecation==2.1.0
+docopt==0.6.2
+gimpformats==2025
+imageio==2.37.0
+lazy-loader==0.4
+loguru==0.7.3
+networkx==3.2.1 ; python_full_version < '3.10'
+networkx==3.4.2 ; python_full_version >= '3.10'
+numpy==2.0.2 ; python_full_version < '3.10'
+numpy==2.2.3 ; python_full_version >= '3.10'
+packaging==24.2
+pillow==10.4.0
+psd-tools==1.10.6
+pylsr==2024
+pyora==0.3.11
+pypdn==1.0.6
+scikit-image==0.24.0 ; python_full_version < '3.10'
+scikit-image==0.25.2 ; python_full_version >= '3.10'
+scipy==1.13.1 ; python_full_version < '3.10'
+scipy==1.15.2 ; python_full_version >= '3.10'
+tifffile==2024.8.30 ; python_full_version < '3.10'
+tifffile==2025.2.18 ; python_full_version >= '3.10'
+typing-extensions==4.12.2 ; python_full_version < '3.11'
+win32-setctime==1.2.0 ; sys_platform == 'win32'