phylogenie 2.0.10__tar.gz → 2.0.11__tar.gz

{phylogenie-2.0.10 → phylogenie-2.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phylogenie
-Version: 2.0.10
+Version: 2.0.11
 Summary: Generate phylogenetic datasets with minimal setup effort
 Author: Gabriele Marino
 Author-email: gabmarino.8601@gmail.com

{phylogenie-2.0.10 → phylogenie-2.0.11}/phylogenie/generators/configs.py

@@ -1,9 +1,6 @@
 from pydantic import BaseModel, ConfigDict
 
 import phylogenie.typings as pgt
-from phylogenie.skyline import SkylineMatrix as _SkylineMatrix
-from phylogenie.skyline import SkylineParameter as _SkylineParameter
-from phylogenie.skyline import SkylineVector as _SkylineVector
 
 
 class Distribution(BaseModel):
@@ -37,10 +34,6 @@ class SkylineMatrixModel(StrictBaseModel):
     change_times: ManyScalars
 
 
-SkylineParameter = Scalar | SkylineParameterModel | _SkylineParameter
-SkylineVector = (
-    str | pgt.Scalar | list[SkylineParameter] | SkylineVectorModel | _SkylineVector
-)
-SkylineMatrix = (
-    str | pgt.Scalar | list[SkylineVector] | SkylineMatrixModel | None | _SkylineMatrix
-)
+SkylineParameter = Scalar | SkylineParameterModel
+SkylineVector = str | pgt.Scalar | list[SkylineParameter] | SkylineVectorModel
+SkylineMatrix = str | pgt.Scalar | list[SkylineVector] | SkylineMatrixModel | None

{phylogenie-2.0.10 → phylogenie-2.0.11}/phylogenie/generators/factories.py

@@ -80,8 +80,6 @@ def one_or_many_scalars(
 def skyline_parameter(
     x: cfg.SkylineParameter, data: dict[str, Any]
 ) -> SkylineParameterLike:
-    if isinstance(x, SkylineParameter):
-        return x
     if isinstance(x, cfg.Scalar):
         return scalar(x, data)
     return SkylineParameter(
@@ -93,8 +91,6 @@ def skyline_parameter(
 def skyline_vector(
     x: cfg.SkylineVector, data: dict[str, Any]
 ) -> SkylineVectorCoercible:
-    if isinstance(x, SkylineVector):
-        return x
     if isinstance(x, str):
         e = _eval_expression(x, data)
         if tg.is_one_or_many_scalars(e):
@@ -155,8 +151,7 @@ def skyline_matrix(
 ) -> SkylineMatrixCoercible | None:
     if x is None:
         return None
-    if isinstance(x, SkylineMatrix):
-        return x
+
     if isinstance(x, str):
         e = _eval_expression(x, data)
         if tg.is_one_or_many_2D_scalars(e):

{phylogenie-2.0.10 → phylogenie-2.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "phylogenie"
-version = "2.0.10"
+version = "2.0.11"
 description = "Generate phylogenetic datasets with minimal setup effort"
 authors = ["Gabriele Marino <gabmarino.8601@gmail.com>"]
 readme = "README.md"