fixed mypy and flake8

Author: anikolaienko

.code_quality/.flake8

@@ -3,6 +3,10 @@ max-line-length = 120
 per-file-ignores =
     **/__init__.py:F401,F403
 ignore =
-    E203 ; https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#slices
-    W503 ; https://github.com/psf/black/issues/52
+    ; E203 whitespace before ':'
+    E203
+    ; W503 line break before binary operator
+    W503
+    ; E704 multiple statements on one line
+    E704
 count = True

.code_quality/.mypy.ini

@@ -1,6 +1,4 @@
 [mypy]
-plugins = sqlalchemy.ext.mypy.plugin
-
 disallow_any_generics = True
 disallow_subclassing_any = True 
 disallow_untyped_calls = True 

CHANGELOG.md

@@ -1,3 +1,10 @@
+
+2.0.0 - 2024/05/12
+* Moved away from poetry. Changed packaging system using pip, build and twine.
+* Upgraded all dependencies.
+* Add support for Python 3.12.
+* Migrated SQLAlchemy from 1.x to 2.x.
+
 1.2.3 - 2022/11/21
 * Added automated code checks for different Python versions.
 

automapper/extensions/sqlalchemy.py

@@ -1,14 +1,15 @@
 from typing import Iterable, Type
 
 from automapper import Mapper
-from sqlalchemy import inspect
+from sqlalchemy.inspection import inspect
+from sqlalchemy.orm import DeclarativeBase
 
 
 def sqlalchemy_spec_decide(obj_type: Type[object]) -> bool:
     return inspect(obj_type, raiseerr=False) is not None
 
 
-def spec_function(target_cls: Type[object]) -> Iterable[str]:
+def spec_function(target_cls: Type[DeclarativeBase]) -> Iterable[str]:
     inspector = inspect(target_cls)
     attrs = [x.key for x in inspector.attrs]
     return attrs

automapper/mapper.py

@@ -233,10 +233,12 @@ def map(
         if target_cls_field_mappings:
             # transform mapping if it's from source class field
             common_fields_mapping = {
-                target_obj_field: getattr(obj, source_field[len(obj_type_prefix) :])
-                if isinstance(source_field, str)
-                and source_field.startswith(obj_type_prefix)
-                else source_field
+                target_obj_field: (
+                    getattr(obj, source_field[len(obj_type_prefix) :])
+                    if isinstance(source_field, str)
+                    and source_field.startswith(obj_type_prefix)
+                    else source_field
+                )
                 for target_obj_field, source_field in target_cls_field_mappings.items()
             }
             if fields_mapping:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "py-automapper"
-version = "1.2.3"
+version = "2.0.0"
 description = "Library for automatically mapping one object to another"
 authors = [
   {name = "Andrii Nikolaienko", email = "[email protected]"}
@@ -43,7 +43,7 @@ Changelog = "https://github.com/anikolaienko/py-automapper/blob/main/CHANGELOG.m
 dev = [
     "tortoise-orm~=0.20.1",
     "pydantic~=2.7.1",
-    "SQLAlchemy[mypy]~=2.0.30",
+    "SQLAlchemy~=2.0.30",
     "twine~=5.0.0",
     "Sphinx~=7.1.2"
 ]

tests/extensions/test_default_extention.py

@@ -19,8 +19,7 @@ def fields(cls) -> Iterable[str]:
 
 @runtime_checkable
 class ClassWithFieldsMethodProtocol(Protocol):
-    def fields(self) -> Iterable[str]:
-        ...
+    def fields(self) -> Iterable[str]: ...
 
 
 def classifier_func(target_cls: Type[T]) -> bool:

tests/extensions/test_sqlalchemy_extention.py

@@ -4,9 +4,11 @@
 from automapper import Mapper, MappingError
 from automapper import mapper as default_mapper
 from sqlalchemy import Column, Integer, String
-from sqlalchemy.orm import declarative_base
+from sqlalchemy.orm import DeclarativeBase
 
-Base = declarative_base()
+
+class Base(DeclarativeBase):
+    pass
 
 
 class UserInfo(Base):

tests/test_complex_objects_mapping.py

@@ -41,8 +41,7 @@ def fields(cls) -> Iterable[str]:
 
 
 class ClassWithFieldsMethodProtocol(Protocol):
-    def fields(self) -> Iterable[str]:
-        ...
+    def fields(self) -> Iterable[str]: ...
 
 
 class ComplexClass:

tests/test_predefined_mapping.py

@@ -41,8 +41,7 @@ def fields(cls) -> Iterable[str]:
 
 
 class ClassWithFieldsMethodProtocol(Protocol):
-    def fields(self) -> Iterable[str]:
-        ...
+    def fields(self) -> Iterable[str]: ...
 
 
 def custom_spec_func(concrete_class: Type[T]) -> Iterable[str]: