feat: Add uv and more tests

Author: n0nSmoker

Dockerfile

@@ -2,13 +2,14 @@ FROM python:3.10.14-alpine
 
 WORKDIR /app
 
-COPY pyproject.toml poetry.lock* /app/
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
+RUN chmod +x /usr/local/bin/uv
+
+COPY pyproject.toml /app/
 
 RUN apk update && \
     apk add build-base postgresql-dev && \
-    pip install --no-cache-dir --upgrade pip && \
-    pip install poetry && \
-    poetry install --no-root --with dev && \
+    uv sync --all-groups && \
     apk del --purge build-base
 
 ADD . /app

MANIFEST

@@ -1,6 +1,13 @@
+# Include required files
+include README.md
+include LICENSE
+
+# Include package files
+recursive-include sqlalchemy_serializer *.py
+
 # Exclude the local virtual environment directory if it's named .venv
 prune .venv
 
 # Exclude dev/test tools
 prune .git
-prune pyproject.toml
+prune pyproject.toml

Makefile

@@ -1,8 +1,9 @@
-.PHONY: test
+.PHONY: test format
 FILE = $(file)
 
 test:
 	TEST_FILE=$(FILE) docker-compose up --build --abort-on-container-exit
 
 format:
-	black .
+	uv run ruff format .
+	uv run ruff check --fix .

docker-compose.yml

@@ -11,11 +11,10 @@ services:
     build: .
     command:
       [
-        "poetry",
+        "uv",
         "run",
         "pytest",
         "-vv",
-        "--pylama",
         "--cov=sqlalchemy_serializer",
         "--cov-report",
         "term-missing",

docs/DEVELOPMENT.md

@@ -6,7 +6,7 @@
 
 - **Python**: 3.10+ (specified in `pyproject.toml`)
 - **Docker & Docker Compose**: Required for running tests with PostgreSQL
-- **Poetry**: Dependency management (installed via Docker or locally)
+- **uv**: Dependency management (installed via Docker or locally)
 
 ### Local Development Setup
 
@@ -16,14 +16,14 @@
    cd SQLAlchemy-serializer
    ```
 
-2. **Install dependencies with Poetry**
+2. **Install dependencies with uv**
    ```bash
-   poetry install --with dev
+   uv pip install -e ".[dev]"
    ```
 
-3. **Activate virtual environment**
+3. **Activate virtual environment** (if using uv's venv)
    ```bash
-   poetry shell
+   source .venv/bin/activate  # or .venv\Scripts\activate on Windows
    ```
 
 ### Docker-based Development
@@ -70,14 +70,14 @@ The Docker setup includes:
    make test
    ```
 
-4. **Format code**
+4. **Format and lint code**
    ```bash
-   make format  # Runs black formatter
+   make format  # Runs ruff format and ruff check --fix
    ```
 
-5. **Check linting**
+5. **Check linting only (no auto-fix)**
    ```bash
-   poetry run pylama .
+   uv run ruff check .
    ```
 
 6. **Commit changes**
@@ -401,10 +401,9 @@ print(serializer.schema._tree)  # Inspect rule tree
 ### Updating Dependencies
 
 1. **Update version in `pyproject.toml`**
-2. **Update lock file**:
+2. **Update dependencies**:
    ```bash
-   poetry update <package>
-   poetry lock
+   uv pip install -e ".[dev]" --upgrade
    ```
 3. **Test compatibility**:
    ```bash
@@ -436,7 +435,7 @@ print(serializer.schema._tree)  # Inspect rule tree
 
 Version is specified in `pyproject.toml`:
 ```toml
-[tool.poetry]
+[project]
 version = "1.4.22"
 ```
 
@@ -449,7 +448,7 @@ Follow [Semantic Versioning](https://semver.org/):
 
 - [ ] All tests pass (`make test`)
 - [ ] Code coverage ≥ 80%
-- [ ] No linting errors (`poetry run pylama .`)
+- [ ] No linting errors (`uv run ruff check .`)
 - [ ] Code formatted (`make format`)
 - [ ] Documentation updated (README.md, ARCHITECTURE.md, DEVELOPMENT.md, KNOWLEDGE.md)
 - [ ] CHANGELOG updated (if maintained)
@@ -469,12 +468,12 @@ Follow [Semantic Versioning](https://semver.org/):
 
 3. **Build package**:
    ```bash
-   poetry build
+   uv build
    ```
 
 4. **Publish to PyPI** (if maintainer):
    ```bash
-   poetry publish
+   uv publish
    ```
 
 5. **Push to repository**:

poetry.lock

@@ -1,42 +1,122 @@
-[tool.poetry]
+[project]
 name = "sqlalchemy-serializer"
 version = "1.4.22"
 description = "Mixin for SQLAlchemy models serialization without pain"
-authors = ["yuri.boiko <yuri.boiko.dev@gmail.com>"]
-license = "MIT"
-readme = "README.md"
-include = [
-    "README.md",
-    "LICENSE",
-    "sqlalchemy_serializer/**"
+authors = [
+    {name = "yuri.boiko", email = "yuri.boiko.dev@gmail.com"}
 ]
+license = {text = "MIT"}
+readme = "README.md"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: Apache Software License",
+    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
 keywords = ["sqlalchemy", "serialize", "to_dict", "JSON"]
-repository = "https://github.com/n0nSmoker/SQLAlchemy-serializer"
+dependencies = [
+    "SQLAlchemy==2.0.45",
+    "psycopg2-binary==2.9.11",
+    "pytz>=2025.2",
+    "setuptools>=80.9.0",
+]
+
+[dependency-groups]
+lint = [
+    "ruff>=0.9.4",
+    "isort>=6.0.1",
+]
+test = [
+    "pytest==9.0.1",
+    "pytest-cov==7.0.0",
+    "requests==2.32.5",
+    "pytest-mock>=3.15.1",
+    "tomli>=2.0.1; python_version < '3.11'",
+]
 
-[tool.poetry.dependencies]
-python = "^3.10"
-SQLAlchemy = "2.0.29"
-psycopg2-binary = "2.9.9"
-pytz = "^2024.1"
-setuptools = "^70.1.1"
-
-[tool.poetry.group.dev.dependencies]
-pytest = "8.1.1"
-pytest-cov = "5.0.0"
-pylama = "8.4.1"
-requests = "2.32.3"
-black = "^24.4.2"
-pytest-mock = "^3.14.0"
+[project.urls]
+repository = "https://github.com/n0nSmoker/SQLAlchemy-serializer"
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["setuptools>=80.9.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+include-package-data = true
 
 [tool.pytest.ini_options]
 addopts = "-xvrs --color=yes"
 log_cli = true
+
+
+[tool.ruff]
+line-length = 95
+
+# Exclude a variety of commonly ignored directories
+exclude = [
+    ".git",
+    ".ruff_cache",
+    ".venv",
+    "__pypackages__",
+    "dist",
+]
+
+lint.select = [
+    "YTT",  # flake8-2020
+    "E",  # pycodestyle
+    "F",  # pyflakes
+    "I",  # isort
+    "ASYNC",  # flake8-async
+    "BLE",  # flake8-blind-except
+    "B",  # flake8-bugbear
+    "COM", # flake8-commas
+    "W",  # pycodestyle warnings
+    "TC",  # flake8-type-checking
+    "ANN",  # flake8-annotations
+    "C90",  # mccabe
+    "PL",  # pylint
+    "ICN",  # flake8-import-conventions
+    "LOG",  # flake8-logging
+    "G",  # flake8-logging-format
+    # "INP",  # flake8-no-pep420
+    "PIE",  # flake8-pie
+    "PYI",  # flake8-pyi
+    "RSE",  # flake8-raise
+    "RET",  # flake8-return
+    "SIM",  # flake8-simplify
+    "SLOT",  # flake8-slots
+    "TID",  # flake8-tidy-imports
+    "TC",  # flake8-type-checking
+    "ARG",  # flake8-unused-arguments
+    "NPY",  # NumPy-specific rules
+    "PERF",  # Perflint (PERF)
+]
+# Allow unused variables when underscore-prefixed
+lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+lint.ignore = [
+    "ANN002",  # Missing type annotation for *args
+    "ANN201",  # Add return type annotation: `None`
+    "ANN204",  # Missing return type annotation for special method
+    "ANN202",  # Missing return type annotation for private function
+    "ANN003",  # Missing type annotation for `**kwargs`
+    "ANN001",  # Missing type annotation for function argument
+    "B008",  # Function calls in default function arguments.
+    "COM812",  # Checks for the absence of trailing commas
+    "S101",  # Use of `assert` detected
+    "PLR0913",  # Too many positional arguments for function call
+    "PLR2004",  # Magic value
+    "PLW1508",  # Invalid type for environment variable default; expected `str` or `None`
+    "PYI024",  # Use `typing.NamedTuple` instead of `collections.namedtuple`
+    "SIM118",  # Use `key in dict` instead of `key in dict.keys()`
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+
+[tool.isort]
+profile = "black"
+line_length = 95
+
+[tool.ruff.lint.isort]
+known-first-party = ["sqlalchemy_serializer"]

pyproject.toml

@@ -1,7 +1,7 @@
 __all__ = ["SerializerMixin", "Serializer", "serialize_collection"]
 
 from sqlalchemy_serializer.serializer import (
-    SerializerMixin,
     Serializer,
+    SerializerMixin,
     serialize_collection,
 )

sqlalchemy_serializer/__init__.py

@@ -1,32 +1,26 @@
 import functools
-import typing as t
 import inspect
+
 from sqlalchemy import inspect as sql_inspect
 
 
-def get_sql_field_names(model_instance) -> t.Set[str]:
-    """
-    :return:  set of sql fields names
+def get_sql_field_names(model_instance) -> set[str]:
+    """:return:  set of sql fields names
     :raise:  sqlalchemy.exc.NoInspectionAvailable
     """
     inspector = sql_inspect(model_instance)
     return {a.key for a in inspector.mapper.attrs}
 
 
-def get_property_field_names(model_instance) -> t.Set[str]:
-    """
-    :return: set of field names defined as @property
-    """
+def get_property_field_names(model_instance) -> set[str]:
+    """:return: set of field names defined as @property"""
     cls = model_instance.__class__
-    return {
-        name for name, member in inspect.getmembers(cls) if isinstance(member, property)
-    }
+    return {name for name, member in inspect.getmembers(cls) if isinstance(member, property)}
 
 
 @functools.lru_cache
-def get_serializable_keys(model_instance) -> t.Set[str]:
-    """
-    :return: set of keys available for serialization
+def get_serializable_keys(model_instance) -> set[str]:
+    """:return: set of keys available for serialization
     :raise:  sqlalchemy.exc.NoInspectionAvailable if model_instance is not an sqlalchemy mapper
     """
     if model_instance.serializable_keys:

sqlalchemy_serializer/lib/fields.py

@@ -1,15 +1,11 @@
 import logging
 from collections import defaultdict
-import typing as t
-
 
 logger = logging.getLogger("serializer")
 
 
 class Tree(defaultdict):
-    def __init__(
-        self, to_include=None, to_exclude=None, is_greedy=True, *args, **kwargs
-    ):
+    def __init__(self, to_include=None, to_exclude=None, is_greedy=True, *args, **kwargs):
         super(Tree, self).__init__(*args, **kwargs)
         self.default_factory = Tree
         self.to_include = to_include
@@ -63,7 +59,7 @@ def __repr__(self):
 
 
 class Schema:
-    def __init__(self, tree: t.Optional[Tree] = None):
+    def __init__(self, tree: Tree | None = None):
         self._tree = tree or Tree()
 
     @property
@@ -112,9 +108,7 @@ def apply(self, rules, is_greedy):
 
                 if is_last_key:
                     if not parent.is_greedy:
-                        logger.debug(
-                            "Ignore rule:%s parent does not accept new rules", raw
-                        )
+                        logger.debug("Ignore rule:%s parent does not accept new rules", raw)
                     elif rule.is_negative and node.to_include:
                         logger.debug("Ignore rule:%s leaf includes key:%s", raw, k)
                     else:
@@ -132,8 +126,7 @@ def is_included(self, key: str) -> bool:
             if not node:
                 return node is None or not node.to_exclude
             return True
-        else:
-            return bool(node is not None and node.to_include)
+        return bool(node is not None and node.to_include)
 
     def fork(self, key: str) -> "Schema":
         return Schema(tree=self._tree[key])