feat: ✨ Project setup updates

ddanier · ddanier · commit 28343d011d41 · 2025-10-07T10:19:31.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,7 @@ updates:
       interval: "weekly"
     assignees:
       - "ddanier"
-  - package-ecosystem: "pip"
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
       interval: "weekly"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,12 +12,12 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.x"
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade poetry
-          poetry install -E fastapi
+          python-version-file: ".python-version"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Install the dependencies
+        run: uv sync --all-extras --dev
       - name: Lint with ruff & pyright
         run: |
-          poetry run ruff check pydantic_async_validation tests
-          poetry run pyright pydantic_async_validation
+          uv run ruff check pydantic_async_validation tests
+          uv run pyright pydantic_async_validation
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,17 +9,9 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v5
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade poetry
-          poetry install
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
       - name: Build package
-        run: poetry build
+        run: uv build
       - name: Publish package
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+        run: uv publish
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,17 +9,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version:
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+
     steps:
       - uses: actions/checkout@v5
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade poetry
-          poetry install -E fastapi
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install the dependencies
+        run: uv sync --all-extras --dev
       - name: Test with pytest
         run: |
-          poetry run tox -e 'py'
+          uv run tox -e 'py'
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/poetry.lock
+/uv.lock
 /dist/*
 /.coverage
 /.tox
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,23 +1,19 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: check-added-large-files
       - id: check-merge-conflict
       - id: check-docstring-first
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.13.3
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
-  - repo: https://github.com/Lucas-C/pre-commit-hooks-safety
-    rev: v1.4.2
-    hooks:
-      - id: python-safety-dependencies-check
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-    rev: v9.22.0
+    rev: v9.23.0
     hooks:
       - id: commitlint
         stages: [commit-msg]
diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.13
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ yourself. This is due to the fact that `__init__()` will always be a sync method
 methods from sync methods.
 
 **Note:** `pydantic-async-validation` is compatible with `pydantic` versions `2.x` only. It supports
-Python `3.8`, `3.9`, `3.10`, `3.11` and `3.12`. This is also ensured running all tests on all those versions
+Python `3.10`, `3.11`, `3.12` and `3.13`. This is also ensured running all tests on all those versions
 using `tox`.
 
 ## Example usage
diff --git a/justfile b/justfile
@@ -19,28 +19,26 @@ _install-pre-commit:
     #!powershell.exe
     Write-Host "Please ensure pre-commit hooks are installed using 'pre-commit install --install-hooks'"
 
-install: (poetry "install" "-E" "fastapi") && _install-pre-commit
+install: (uv "sync" "--group" "dev") && _install-pre-commit
 
-update: (poetry "install" "-E" "fastapi")
+update: (uv "sync" "--group" "dev")
 
-poetry *args:
-    poetry {{args}}
+uv *args:
+    uv {{args}}
 
-test *args: (poetry "run" "pytest" "--cov=pydantic_async_validation" "--cov-report" "term-missing:skip-covered" args)
+test *args: (uv "run" "pytest" "--cov=pydantic_async_validation" "--cov-report" "term-missing:skip-covered" args)
 
-test-all: (poetry "run" "tox")
+test-all: (uv "run" "tox")
 
-ruff *args: (poetry "run" "ruff" "check" "pydantic_async_validation" "tests" args)
+ruff *args: (uv "run" "ruff" "check" "pydantic_async_validation" "tests" args)
 
-pyright *args: (poetry "run" "pyright" "pydantic_async_validation" args)
+pyright *args: (uv "run" "pyright" "pydantic_async_validation" args)
 
 lint: ruff pyright
 
-publish: (poetry "publish" "--build")
-
-release version: (poetry "version" version)
+release version: (uv "version" version)
     git add pyproject.toml
-    git commit -m "release: 🔖 v$(poetry version --short)" --no-verify
-    git tag "v$(poetry version --short)"
+    git commit -m "release: 🔖 v$(uv version --short)" --no-verify
+    git tag "v$(uv version --short)"
     git push
     git push --tags
diff --git a/pydantic_async_validation/fastapi.py b/pydantic_async_validation/fastapi.py
@@ -1,14 +1,13 @@
 from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Optional, Union
 
 from fastapi.exceptions import RequestValidationError
 from pydantic import ValidationError
 from pydantic_core import ErrorDetails
 
 
 def _prefix_request_errors(
-    prefix: tuple[Union[int, str], ...],
+    prefix: tuple[int | str, ...],
     errors: list[ErrorDetails],
 ) -> list[ErrorDetails]:
     """Add prefix to errors in preparation for request validation error conversion."""
@@ -26,7 +25,7 @@ def _prefix_request_errors(
 
 @contextmanager
 def ensure_request_validation_errors(
-    prefix: Optional[Union[tuple[Union[int, str], ...], str]] = None,
+    prefix: tuple[int | str, ...] | str | None = None,
 ) -> Generator[None, None, None]:
     """
     Converter for `ValidationError` to `RequestValidationError`.
diff --git a/pydantic_async_validation/metaclasses.py b/pydantic_async_validation/metaclasses.py
@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from pydantic._internal._model_construction import ModelMetaclass
 
@@ -24,9 +24,9 @@ def __new__(
         async_field_validators: list[tuple[list[str], ValidationInfo]] = []
         async_model_validators: list[ValidationInfo] = []
 
-        async_field_validator_fields: Optional[list[str]]
-        async_field_validator_config: Optional[ValidationInfo]
-        async_model_validator_config: Optional[ValidationInfo]
+        async_field_validator_fields: list[str] | None
+        async_field_validator_config: ValidationInfo | None
+        async_model_validator_config: ValidationInfo | None
 
         for base in bases:
             async_field_validators += getattr(
diff --git a/pydantic_async_validation/mixins.py b/pydantic_async_validation/mixins.py
@@ -1,4 +1,4 @@
-from typing import ClassVar, Union
+from typing import ClassVar
 
 import pydantic
 from pydantic_core import InitErrorDetails, PydanticCustomError, ValidationError
@@ -82,7 +82,7 @@ async def model_async_validate(self) -> None:
 
         # Also call async validation on attribute values
         async def extend_with_validation_errors_by(
-            prefix: tuple[Union[int, str], ...],
+            prefix: tuple[int | str, ...],
             instance: AsyncValidationModelMixin,
         ) -> None:
             try:
diff --git a/pydantic_async_validation/utils.py b/pydantic_async_validation/utils.py
@@ -1,6 +1,7 @@
+from collections.abc import Callable
 from functools import wraps
 from inspect import Signature, signature
-from typing import Callable, Union, cast
+from typing import cast
 
 from pydantic import PydanticUserError
 from pydantic_core import ErrorDetails, InitErrorDetails, PydanticCustomError
@@ -163,8 +164,8 @@ def generic_model_validator_wrapper(
 
 
 def prefix_errors(
-    prefix: tuple[Union[int, str], ...],
-    errors: Union[list[InitErrorDetails], list[ErrorDetails]],
+    prefix: tuple[int | str, ...],
+    errors: list[InitErrorDetails] | list[ErrorDetails],
 ) -> list[InitErrorDetails]:
     """
     Extend all errors passed as list to include an additional prefix.
diff --git a/pydantic_async_validation/validators.py b/pydantic_async_validation/validators.py
@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from types import FunctionType
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any
 
 from pydantic.errors import PydanticUserError
 
@@ -14,7 +15,7 @@
 
     ValidatorCallable = Callable[
         [
-            Optional[ModelOrDc],
+            ModelOrDc | None,
             Any,
             dict[str, Any],
             str,
@@ -36,7 +37,7 @@ def __init__(
         self,
         func: Callable,
         *,
-        extra: Optional[dict[str, Any]] = None,
+        extra: dict[str, Any] | None = None,
 
     ) -> None:
         self.func = func
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,33 +1,36 @@
-[tool.poetry]
+[project]
 name = "pydantic-async-validation"
 version = "0.3.0"
 description = "Add async validation to pydantic"
-authors = ["TEAM23 GmbH <info@team23.de>"]
+authors = [{ name = "TEAM23 GmbH", email = "info@team23.de" }]
 license = "MIT"
 readme = "README.md"
-packages = [{include = "pydantic_async_validation"}]
-
-[tool.poetry.dependencies]
-python = "^3.8"
-pydantic = ">=2.0.0,<3.0.0"
-fastapi = {version = ">=0.100.0,<1.0.0", optional = true}
-pytest = ">=7.4,<9.0"
-
-[tool.poetry.extras]
-fastapi = ["fastapi"]
-
-[tool.poetry.group.dev.dependencies]
-pytest = ">=7.1.2,<9.0.0"
-pytest-cov = ">=3,<6"
-pytest-asyncio = ">=0.21.1,<0.25.0"
-tox = ">=3.26,<5.0"
-httpx = ">=0.24.1,<0.29.0"
-ruff = ">=0.5.0,<0.14.0"
-pyright = ">=1.1.350,<1.2"
+requires-python = ">=3.10"
+dependencies = [
+    "pydantic>=2.0.0,<3.0.0",
+    "pytest>=7.4,<9.0",
+]
+
+[project.optional-dependencies]
+fastapi = ["fastapi>=0.100.0,<1.0.0"]
+
+[project.urls]
+Repository = "https://github.com/team23/pydantic-async-validation"
+
+[dependency-groups]
+dev = [
+    "pytest>=7.1.2,<9.0.0",
+    "pytest-cov>=3,<6",
+    "pytest-asyncio>=0.21.1,<0.25.0",
+    "tox>=3.26,<5.0",
+    "httpx>=0.24.1,<0.29.0",
+    "ruff>=0.5.0,<0.14.0",
+    "pyright>=1.1.350,<1.2",
+]
 
 [tool.ruff]
 line-length = 115
-target-version = "py39"
+target-version = "py310"
 output-format = "grouped"
 
 [tool.ruff.lint]
@@ -40,5 +43,9 @@ ignore = ["A001","A002","A003","ANN401","C901","N8","B008","F405","F821"]
 "test_*.py" = ["S101","ANN","F401"]
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["uv_build>=0.8.22,<0.9.0"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = "pydantic_async_validation"
+module-root = ""
diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 isolated_build = True
 envlist =
-    py39,
     py310,
     py311,
+    py313,
     py312
 
 [testenv]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/poetry.lock`
	`1`	`+/uv.lock`
`2`	`2`	`/dist/*`
`3`	`3`	`/.coverage`
`4`	`4`	`/.tox`