resolve merge conflicts in dependences

Author: esoteric-ephemera

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = ["setuptools >= 65.0.0", "versioningit ~= 1.0", "wheel"]
+requires = ["setuptools >= 65.0.0", "versioningit >= 1,< 4", "wheel"]
 
 [project]
 authors = [
@@ -43,7 +43,7 @@ requires-python = '>=3.8'
 dev = ["pre-commit>=2.12.1"]
 #docs = ["jupyter-book>=0.13.1",]
 
-tests = ["pytest==8.3.3", "pytest-cov==6.0.0", "types-requests"]
+tests = ["pytest==8.3.5", "pytest-cov==6.0.0", "types-requests"]
 
 
 [tool.setuptools.dynamic]

requirements-dev.txt

@@ -1,9 +1,9 @@
-pytest==8.3.3
+pytest==8.3.5
 pytest-cov==6.0.0
-coverage==7.6.7
-mypy==1.13.0
+coverage==7.8.0
+mypy==1.15.0
 pydocstyle==6.1.1
 flake8==7.1.1
-pylint==3.3.1
-black==24.8.0
+pylint==3.3.6
+black==25.1.0
 pydantic==2.11.3