refactor tests

Author: FredHappyface

.gitignore

@@ -1,6 +1,5 @@
 !test
-README.rst
-requirements_optional.txt
+uv.lock
 profile.*
 
 # DepHell stuff

.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

pyproject.toml

@@ -1,9 +1,11 @@
-[tool.poetry]
+[project]
 name = "blendmodes"
 version = "2024.1.1"
-license = "mit"
 description = "Use this module to apply a number of blending modes to a background and foreground image"
-authors = ["FredHappyface"]
+authors = [{ name = "FredHappyface" }]
+requires-python = ">=3.9,<4.0"
+readme = "README.md"
+license = "mit"
 classifiers = [
 	"Development Status :: 5 - Production/Stable",
 	"Intended Audience :: Developers",
@@ -13,30 +15,28 @@ classifiers = [
 	"Programming Language :: Python :: Implementation :: CPython",
 	"Topic :: Multimedia :: Graphics",
 	"Topic :: Software Development :: Libraries :: Python Modules",
-	"Topic :: Utilities"
+	"Topic :: Utilities",
+]
+dependencies = [
+	"aenum>=3.1.15",
+	"numpy>=2.0.2",
+	"pillow>=10.4.0",
 ]
-homepage = "https://github.com/FHPythonUtils/BlendModes"
-repository = "https://github.com/FHPythonUtils/BlendModes"
-documentation = "https://github.com/FHPythonUtils/BlendModes/blob/master/README.md"
-readme = "README.md"
-
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0"
-Pillow = "<11,>=10.2.0"
-numpy = "<2,>=1.26.4"
-aenum = "<4,>=3.1.15"
 
-[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/BlendModes"
+Repository = "https://github.com/FHPythonUtils/BlendModes"
+Documentation = "https://github.com/FHPythonUtils/BlendModes/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
@@ -46,7 +46,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",
@@ -87,3 +86,7 @@ deps =
 	pytest
 commands = pytest tests
 """
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"

requirements.txt

@@ -1,3 +1,7 @@
-Pillow<11,>=10.2.0
-aenum<4,>=3.1.15
-numpy<2,>=1.26.4
+# This file was autogenerated by uv via the following command:
+#    uv export --no-hashes --no-dev -o requirements.txt
+-e .
+aenum==3.1.15
+numpy==2.0.2 ; python_full_version < '3.10'
+numpy==2.2.3 ; python_full_version >= '3.10'
+pillow==10.4.0