From bcc7a14a93139f49cfd888dc7eb52ca3973cf9ba Mon Sep 17 00:00:00 2001 From: Constantine Evans Date: Fri, 22 Jul 2022 17:27:10 +0100 Subject: [PATCH] New version. --- setup.py | 2 +- xgrow/tileset.py | 4 ++-- xgrow/xgrow_parallel.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 9aff955..b64251b 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def run(self): setup( name="xgrow", - version="20220303.dev0", + version="20220722", packages=["xgrow"], install_requires=["pyyaml", "typing_extensions", "numpy", "pandas", "matplotlib"], include_package_data=True, diff --git a/xgrow/tileset.py b/xgrow/tileset.py index b0aae4d..72ba053 100644 --- a/xgrow/tileset.py +++ b/xgrow/tileset.py @@ -204,7 +204,7 @@ def xgname(self) -> str: @classmethod def from_dict(cls, d: Mapping[str, str | int]) -> Bond: - return cls(**d) + return cls(**d) # type: ignore def to_dict(self) -> Dict[str, str | int]: return {k: v for k, v in self.__dict__.items() if v is not None} @@ -286,7 +286,7 @@ class TileSet: tiles: List[Tile] bonds: List[Bond] = field(default_factory=list) glues: List[Glue] = field(default_factory=list) - xgrowargs: XgrowArgs = XgrowArgs() + xgrowargs: XgrowArgs = field(default_factory=XgrowArgs) initstate: Optional[InitState] = None @classmethod diff --git a/xgrow/xgrow_parallel.py b/xgrow/xgrow_parallel.py index a64ce00..d722f25 100755 --- a/xgrow/xgrow_parallel.py +++ b/xgrow/xgrow_parallel.py @@ -4,7 +4,7 @@ import pandas as pd import numpy as np from io import StringIO -from . import xgrowoutput as xgo +from . import parseoutput as xgo def _run_xgrow(params): @@ -181,5 +181,5 @@ def progress(self): def map(self, function): return dict( - (n, array([[k, function(x)] for k, x in s.items()])) for n in self.res + (n, np.array([[k, function(x)] for k, x in self.items()])) for n in self.res )