encommon 0.15.0__tar.gz → 0.16.0__tar.gz

{encommon-0.15.0/encommon.egg-info → encommon-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.15.0
+Version: 0.16.0
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

{encommon-0.15.0 → encommon-0.16.0}/encommon/config/config.py

@@ -174,19 +174,6 @@ class Config:
         return deepcopy(returned)
 
 
-    @property
-    def config(
-        self,
-    ) -> DictStrAny:
-        """
-        Return the configuration dumped from the Pydantic model.
-
-        :returns: Configuration dumped from the Pydantic model.
-        """
-
-        return self.params.model_dump()
-
-
     @property
     def basic(
         self,
@@ -278,6 +265,19 @@ class Config:
         return self.__params
 
 
+    @property
+    def config(
+        self,
+    ) -> DictStrAny:
+        """
+        Return the configuration dumped from the Pydantic model.
+
+        :returns: Configuration dumped from the Pydantic model.
+        """
+
+        return self.params.endumped
+
+
     @property
     def logger(
         self,

{encommon-0.15.0 → encommon-0.16.0}/encommon/config/logger.py

@@ -329,7 +329,7 @@ class Logger:
     :param stdo_level: Minimum level for the message to pass.
     :param file_level: Minimum level for the message to pass.
     :param file_path: Enables writing to the filesystem path.
-    :param params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     """
 
     __params: 'LoggerParams'

{encommon-0.15.0 → encommon-0.16.0}/encommon/config/test/test_config.py

@@ -68,8 +68,6 @@ def test_Config(
 
     assert len(config.sargs) == 1
 
-    assert len(config.config) == 3
-
     assert len(config.basic) == 3
 
     assert len(config.merge) == 5
@@ -78,6 +76,8 @@ def test_Config(
 
     assert config.params
 
+    assert len(config.config) == 3
+
     assert config.logger
 
     assert config.crypts
@@ -87,6 +87,39 @@ def test_Config(
         'pytemp': tmp_path,
         'PROJECT': PROJECT}
 
+
+    sample_path = (
+        SAMPLES / 'basic.json')
+
+    sample = load_sample(
+        path=sample_path,
+        update=ENPYRWS,
+        content=config.basic,
+        replace=replaces)
+
+    expect = prep_sample(
+        content=config.basic,
+        replace=replaces)
+
+    assert expect == sample
+
+
+    sample_path = (
+        SAMPLES / 'merge.json')
+
+    sample = load_sample(
+        path=sample_path,
+        update=ENPYRWS,
+        content=config.merge,
+        replace=replaces)
+
+    expect = prep_sample(
+        content=config.merge,
+        replace=replaces)
+
+    assert expect == sample
+
+
     sample_path = (
         SAMPLES / 'config.json')
 

{encommon-0.15.0 → encommon-0.16.0}/encommon/crypts/crypts.py

@@ -48,7 +48,7 @@ class Crypts:
     >>> crypts.decrypt(encrypt)
     'example'
 
-    :param params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     """
 
     __params: 'CryptsParams'
@@ -154,7 +154,7 @@ class Crypts:
         Create a new phrase using the provided input parameters.
 
         :param unique: Unique identifier of mapping passphrase.
-        :param params: Parameters for instantiating the instance.
+        :param params: Parameters used to instantiate the class.
         """
 
         phrases = self.params.phrases

{encommon-0.15.0 → encommon-0.16.0}/encommon/times/time.py

@@ -134,9 +134,7 @@ class Time:
         :returns: Boolean indicating outcome from the operation.
         """
 
-        hashed = int(self.mpoch)
-
-        return int(1e9 + hashed)
+        return hash(self.__source)
 
 
     def __str__(

{encommon-0.15.0 → encommon-0.16.0}/encommon/times/timers.py

@@ -97,7 +97,7 @@ class Timers:
     >>> timers.ready('one')
     True
 
-    :param params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     :param store: Optional database path for keeping state.
     :param group: Optional override for default group name.
     """
@@ -374,7 +374,7 @@ class Timers:
         Create a new timer using the provided input parameters.
 
         :param unique: Unique identifier for the related child.
-        :param params: Parameters for instantiating the instance.
+        :param params: Parameters used to instantiate the class.
         :returns: Newly constructed instance of related class.
         """
 

{encommon-0.15.0 → encommon-0.16.0}/encommon/times/windows.py

@@ -97,7 +97,7 @@ class Windows:
     >>> [windows.ready('one') for x in range(3)]
     [True, True, False]
 
-    :param params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     :param start: Determine the start for scheduling window.
     :param stop: Determine the ending for scheduling window.
     :param store: Optional database path for keeping state.
@@ -439,7 +439,7 @@ class Windows:
         Create a new window using the provided input parameters.
 
         :param unique: Unique identifier for the related child.
-        :param params: Parameters for instantiating the instance.
+        :param params: Parameters used to instantiate the class.
         :returns: Newly constructed instance of related class.
         """
 

{encommon-0.15.0 → encommon-0.16.0}/encommon/types/classes.py

@@ -22,7 +22,7 @@ class BaseModel(Pydantic, extra='forbid'):
 
 
     @property
-    def model_dumped(
+    def endumped(
         self,
     ) -> DictStrAny:
         """
@@ -35,7 +35,7 @@ class BaseModel(Pydantic, extra='forbid'):
 
 
     @property
-    def model_pruned(
+    def enpruned(
         self,
     ) -> DictStrAny:
         """

{encommon-0.15.0 → encommon-0.16.0}/encommon/types/test/test_classes.py

@@ -26,8 +26,8 @@ def test_BaseModel() -> None:
     params = LoggerParams(
         stdo_level='info')
 
-    dumped = params.model_dumped
-    pruned = params.model_pruned
+    dumped = params.endumped
+    pruned = params.enpruned
 
     assert dumped == {
         'file_level': None,

{encommon-0.15.0 → encommon-0.16.0}/encommon/utils/sample.py

@@ -16,10 +16,10 @@ from typing import Any
 from typing import Callable
 from typing import Optional
 
-from pydantic import BaseModel
 
 from .files import read_text
 from .files import save_text
+from ..types import BaseModel
 from ..types import DictStrAny
 from ..types import rplstr
 
@@ -72,7 +72,7 @@ def prep_sample(  # noqa: CFQ004
             return asdict(value)
 
         if isinstance(value, BaseModel):
-            return value.model_dump()
+            return value.endumped
 
         return str(value)
 

{encommon-0.15.0 → encommon-0.16.0}/encommon/utils/stdout.py

@@ -19,11 +19,10 @@ from typing import Optional
 from typing import TYPE_CHECKING
 from typing import Union
 
-from pydantic import BaseModel
-
 from .common import JOINABLE
 from ..times import Duration
 from ..times import Time
+from ..types import BaseModel
 from ..types import Empty
 from ..types import clsname
 from ..types.strings import COMMAD
@@ -308,7 +307,7 @@ def array_ansi(  # noqa: CFQ001, CFQ004
     ) -> None:
 
         if isinstance(source, BaseModel):
-            source = source.model_dump()
+            source = source.endumped
 
         if is_dataclass(source):
             source = asdict(source)

encommon-0.16.0/encommon/version.txt

@@ -0,0 +1 @@
+0.16.0

{encommon-0.15.0 → encommon-0.16.0/encommon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.15.0
+Version: 0.16.0
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

{encommon-0.15.0 → encommon-0.16.0}/setup.cfg

@@ -10,12 +10,8 @@ ignore =
 	SFS301,
 	W503,
 per-file-ignores = 
-	encommon/conftest.py:LIT015,
 	encommon/crypts/hashes.py:S324,
-	encommon/times/timers.py:S608,
-	encommon/times/windows.py:S608,
 	encommon/times/utils.py:DTZ001,
-	encommon/utils/test/test_sample.py:S108,
 	encommon/utils/test/test_stdout.py:LIT015,
 	encommon/utils/sample.py:ANN401,SIM114,
 	encommon/utils/stdout.py:SIM114,

encommon-0.15.0/encommon/version.txt

@@ -1 +0,0 @@
-0.15.0