0.2.7

Author: spacemanspiff2007

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.4.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.8.0
+    rev: v5.11.3
     hooks:
       - id: isort
         name: isort (python)
 
-  - repo: https://gitlab.com/PyCQA/flake8
-    rev: '3.9.2'
+  - repo: https://github.com/PyCQA/flake8
+    rev: '6.0.0'
     hooks:
     -   id: flake8

docs/requirements.txt

@@ -1,4 +1,4 @@
 # Packages required to build the documentation
 sphinx                      >= 5.3,     < 6
-sphinx-autodoc-typehints    >= 1.17,    < 2
-sphinx_rtd_theme            >= 1,       < 2
+sphinx-autodoc-typehints    >= 1.20.1,  < 2
+sphinx_rtd_theme            >= 1.1.1,   < 2

readme.md

@@ -157,6 +157,9 @@ sub.cancel()
 ```
 
 # Changelog
+#### 0.2.7 (09.01.2023)
+- Fixed default generation for data types that inherit from python base types
+
 #### 0.2.6 (21.12.2022)
 - Fixed an issue where the default yaml file would not be created properly when using aliases in container
 

requirements.txt

@@ -2,5 +2,5 @@
 -r requirements_setup.txt
 
 # testing dependencies
-pytest     >= 7.1,  < 8
-pre-commit >= 2,    < 3
+pytest     >= 7.2,  < 8
+pre-commit >= 2.21, < 3

setup.py

@@ -62,6 +62,7 @@ def load_req() -> typing.List[str]:
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Software Development :: Libraries"
     ],

src/easyconfig/__version__.py

@@ -1 +1 @@
-__version__ = '0.2.6'
+__version__ = '0.2.7'

src/easyconfig/yaml/from_model.py

@@ -1,7 +1,6 @@
 from enum import Enum
 
 from pydantic import BaseModel
-from pydantic.fields import ModelField
 
 from easyconfig.__const__ import ARG_NAME_IN_FILE, MISSING
 from easyconfig.yaml import CommentedMap, CommentedSeq
@@ -10,13 +9,19 @@
 
 
 def _get_yaml_value(obj, parent_model: BaseModel, skip_none=True):
+    if obj is None:
+        return None
+
     # Sometimes enum is used with int/str
     if isinstance(obj, Enum):
         return _get_yaml_value(obj.value, parent_model=parent_model, skip_none=skip_none)
 
     # yaml native datatypes
-    if isinstance(obj, (int, float, str, bool, bytes, NoneType)):
-        return obj
+    # Pydantic defines several validators that inherit from the python base type
+    # Yaml can't represent those, so we cast them back to the native data type.
+    for data_type in (int, float, str, bool, bytes):
+        if isinstance(obj, data_type):
+            return data_type(obj)
 
     if isinstance(obj, BaseModel):
         return cmap_from_model(obj, skip_none=skip_none)
@@ -43,7 +48,7 @@ def _get_yaml_value(obj, parent_model: BaseModel, skip_none=True):
 
 def cmap_from_model(model: BaseModel, skip_none=True) -> CommentedMap:
     cmap = CommentedMap()
-    for obj_key, field in model.__fields__.items():  # type: str, ModelField
+    for obj_key, field in model.__fields__.items():
         value = getattr(model, obj_key, MISSING)
         if value is MISSING or (skip_none and value is None):
             continue

tests/helper/my_path.py

@@ -11,12 +11,15 @@ class Path(_path_type):
     def __init__(self, *args, does_exist: bool = True, initial_value: Optional[str] = None, **kwargs):
         super(Path, self).__init__()
 
-        # Pathlib init
-        drv, root, parts = self._parse_args(args)
-        self._drv = drv
-        self._root = root
-        self._parts = parts
-        self._init()
+        if hasattr(Path, '_from_parts'):
+            Path._from_parts(args)
+        else:
+            # Pathlib init
+            drv, root, parts = self._parse_args(args)
+            self._drv = drv
+            self._root = root
+            self._parts = parts
+            self._init()
 
         # Own Path implementation
         self.does_exist: bool = does_exist

tests/yaml/test_model_to_yaml.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from typing import List, Optional
 
-from pydantic import BaseModel, Field
+from pydantic import AnyHttpUrl, BaseModel, ByteSize, Field
 
 from easyconfig.__const__ import ARG_NAME_IN_FILE
 from easyconfig.yaml.from_model import cmap_from_model
@@ -17,6 +17,14 @@ class SimpleModel(BaseModel):
     assert dump_yaml(cmap_from_model(SimpleModel())) == 'a: 5\nb: 6\n'
 
 
+def test_base_overrides():
+    class SimpleModel(BaseModel):
+        size: ByteSize
+        url: AnyHttpUrl = 'http://test.de'
+
+    assert dump_yaml(cmap_from_model(SimpleModel(size=ByteSize(1024)))) == 'size: 1024\nurl: http://test.de\n'
+
+
 def test_simple_model_complex_types():
     class SimpleModel(BaseModel):
         a: datetime = datetime(2000, 1, 1)

tox.ini

@@ -10,8 +10,9 @@ envlist =
 [gh-actions]
 python =
     3.8: py38
-    3.9: py39, flake, docs
-    3.10: py10
+    3.9: py39
+    3.10: py10, flake, docs
+    3.11: py11
 
 [testenv]
 deps =