Merge pull request #98 from pallets-eco/replace-black-by-ruff

Replace Black by Ruff

Author: CheeseCake87

.flake8

@@ -39,9 +39,6 @@ jobs:
         python -m pip install --upgrade pip
         pip install -e .
         pip install -r requirements/test.txt
-    - name: Test with pytest
+    - name: Run tests and check code format
       run: |
-        python3 -m pytest
-    - name: Lint with flake8
-      run: |
-        flake8 .
+        python3 -m pytest -ruff --ruff-format

.github/workflows/tests.yml

@@ -2,7 +2,6 @@
 
 [![PyPI](https://img.shields.io/pypi/v/Flask-Pydantic?color=g)](https://pypi.org/project/Flask-Pydantic/)
 [![License](https://img.shields.io/badge/license-MIT-purple)](https://github.com/bauerji/flask_pydantic/blob/master/LICENSE)
-[![Code style](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black)
 
 Flask extension for integration of the awesome [pydantic package](https://github.com/samuelcolvin/pydantic) with [Flask](https://palletsprojects.com/p/flask/).
 
@@ -343,11 +342,11 @@ Feature requests and pull requests are welcome. For major changes, please open a
   ```bash
   git checkout -b <your_branch_name>
   ```
-- run tests
+- make sure your code style is compliant with [Ruff](https://github.com/astral-sh/ruff). Your can check these errors and automatically correct some of them with `ruff check --select I --fix . `
+- run tests and check code format
   ```bash
-  python3 -m pytest
+  python3 -m pytest --ruff --ruff-format
   ```
-- if tests fails on Black tests, make sure You have your code compliant with style of [Black formatter](https://github.com/psf/black)
 - push your changes and create a pull request to master branch
 
 ## TODOs:

README.md

@@ -2,7 +2,7 @@
 from typing import Any, Callable, Iterable, List, Optional, Tuple, Type, Union
 
 from flask import Response, current_app, jsonify, make_response, request
-from pydantic import BaseModel, ValidationError, TypeAdapter, RootModel
+from pydantic import BaseModel, RootModel, TypeAdapter, ValidationError
 
 from .converters import convert_query_params
 from .exceptions import (
@@ -53,7 +53,7 @@ def is_iterable_of_models(content: Any) -> bool:
 def validate_many_models(model: Type[BaseModel], content: Any) -> List[BaseModel]:
     try:
         return [model(**fields) for fields in content]
-    except TypeError:
+    except TypeError as te:
         # iteration through `content` fails
         err = [
             {
@@ -62,9 +62,9 @@ def validate_many_models(model: Type[BaseModel], content: Any) -> List[BaseModel
                 "type": "type_error.array",
             }
         ]
-        raise ManyModelValidationError(err)
+        raise ManyModelValidationError(err) from te
     except ValidationError as ve:
-        raise ManyModelValidationError(ve.errors())
+        raise ManyModelValidationError(ve.errors()) from ve
 
 
 def validate_path_params(func: Callable, kwargs: dict) -> Tuple[dict, list]:
@@ -194,13 +194,13 @@ def wrapper(*args, **kwargs):
                 else:
                     try:
                         b = body_model(**body_params)
-                    except TypeError:
+                    except TypeError as te:
                         content_type = request.headers.get("Content-Type", "").lower()
                         media_type = content_type.split(";")[0]
                         if media_type != "application/json":
                             return unsupported_media_type_response(content_type)
                         else:
-                            raise JsonBodyParsingError()
+                            raise JsonBodyParsingError() from te
                     except ValidationError as ve:
                         err["body_params"] = ve.errors()
             form_in_kwargs = func.__annotations__.get("form")
@@ -215,13 +215,13 @@ def wrapper(*args, **kwargs):
                 else:
                     try:
                         f = form_model(**form_params)
-                    except TypeError:
+                    except TypeError as te:
                         content_type = request.headers.get("Content-Type", "").lower()
                         media_type = content_type.split(";")[0]
                         if media_type != "multipart/form-data":
                             return unsupported_media_type_response(content_type)
                         else:
-                            raise JsonBodyParsingError
+                            raise JsonBodyParsingError from te
                     except ValidationError as ve:
                         err["form_params"] = ve.errors()
             request.query_params = q

flask_pydantic/core.py

@@ -37,8 +37,19 @@ name = "flask_pydantic"
 
 [tool.pytest]
 testpaths = "tests"
-addopts = "-vv --black --cov --cov-config=pyproject.toml -s"
-flake8-ignore = "E121 E122 E123 E124 E125 E126 E127 E128 E711 E712 F811 F841 H803 E501 E265 E741 W391 W503 E203"
+addopts = "-vv --ruff --ruff-format --cov --cov-config=pyproject.toml -s"
+
+[tool.ruff]
+src = ["flask_pydantic"]
+lint.select = [
+    "B",  # flake8-bugbear
+    "E",  # pycodestyle error
+    "F",  # pyflakes
+    "I",  # isort
+    "UP",  # pyupgrade
+    "W",  # pycodestyle warning
+]
+lint.ignore = ["E501"]
 
 [tool.coverage.run]
 branch = true

pyproject.toml

@@ -1,6 +1,5 @@
 pytest
 pytest-flask
-pytest-flake8
 pytest-coverage
-pytest-black
 pytest-mock
+pytest-ruff

requirements/test.txt

@@ -1,11 +1,12 @@
-from ..util import assert_matches
 import re
 from typing import List, Optional
 
 import pytest
 from flask import jsonify, request
-from flask_pydantic import validate, ValidationError
-from pydantic import BaseModel, RootModel, ConfigDict
+from flask_pydantic import ValidationError, validate
+from pydantic import BaseModel, ConfigDict, RootModel
+
+from ..util import assert_matches
 
 
 class ArrayModel(BaseModel):
@@ -308,7 +309,7 @@ def test_custom_headers(client):
 
 
 @pytest.mark.usefixtures("app_with_custom_headers_status")
-def test_custom_headers(client):
+def test_custom_headers_status(client):
     response = client.get("/custom_headers_status")
     assert response.json == {"test": 1}
     assert response.status_code == 201

tests/func/test_app.py

@@ -1,10 +1,9 @@
 import re
 from typing import Any, List, NamedTuple, Optional, Type, Union
-from ..util import assert_matches
 
 import pytest
 from flask import jsonify
-from flask_pydantic import validate, ValidationError
+from flask_pydantic import ValidationError, validate
 from flask_pydantic.core import convert_query_params, is_iterable_of_models
 from flask_pydantic.exceptions import (
     InvalidIterableOfModelsException,
@@ -13,6 +12,8 @@
 from pydantic import BaseModel, RootModel
 from werkzeug.datastructures import ImmutableMultiDict
 
+from ..util import assert_matches
+
 
 class ValidateParams(NamedTuple):
     body_model: Optional[Type[BaseModel]] = None