PySimultan 0.2.10__tar.gz → 0.3.0__tar.gz

{pysimultan-0.2.10 → pysimultan-0.3.0}/LICENSE.txt

@@ -1,17 +1,17 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

{pysimultan-0.2.10 → pysimultan-0.3.0}/MANIFEST.in

@@ -1,9 +1,9 @@
-include README.rst
-include LICENSE.txt
-include requirements.txt
-
-graft src/py_plot_tools/resources
-graft src/py_plot_tools/basic_geometries/gui_adaptions/infos/generated
-graft src/py_plot_tools/generated
-recursive-exclude src/tests *
-recursive-include src/resources *
+include README.rst
+include LICENSE.txt
+include requirements.txt
+
+graft src/py_plot_tools/resources
+graft src/py_plot_tools/basic_geometries/gui_adaptions/infos/generated
+graft src/py_plot_tools/generated
+recursive-exclude src/tests *
+recursive-include src/resources *

{pysimultan-0.2.10/src/PySimultan.egg-info → pysimultan-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.2.10
+Version: 0.3.0
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{pysimultan-0.2.10 → pysimultan-0.3.0}/README.md

@@ -1,5 +1,5 @@
-===================================================
-geometry_utils: Several tools to work with geometry
-===================================================
-
-Python library with several tools to work with geometry
+===================================================
+geometry_utils: Several tools to work with geometry
+===================================================
+
+Python library with several tools to work with geometry

{pysimultan-0.2.10 → pysimultan-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PySimultan"
-version = "0.2.10"
+version = "0.3.0"
 authors = [
     {name = "Max Bühler", email = "maximilian.buehler@tuwien.ac.at"}
 ]

{pysimultan-0.2.10 → pysimultan-0.3.0}/requirements.txt

@@ -1,14 +1,14 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile requirements.in
-#
-six
-numpy
-pythonnet
-colorlog
-ruamel.yaml
-tqdm
-pandas
-pyarrow
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements.in
+#
+six
+numpy
+pythonnet
+colorlog
+ruamel.yaml
+tqdm
+pandas
+pyarrow

{pysimultan-0.2.10 → pysimultan-0.3.0}/setup.py

@@ -6,9 +6,12 @@ import setuptools
 
 project_dir = Path(__file__).parent
 
+with project_dir.joinpath("requirements.txt").open() as f:
+    install_requires = f.read().strip().split("\n")
+
 setuptools.setup(
     name="PySimultan",
-    version="0.2.10",
+    version="0.3.0",
     description="Integrate SIMULTAN into Python",
     # Allow UTF-8 characters in README with encoding argument.
     long_description=project_dir.joinpath("README.md").read_text(encoding="utf-8"),
@@ -37,7 +40,7 @@ setuptools.setup(
     # For VCS dependencies, use pip >= 19 and the PEP 508 syntax.
     #   Example: 'requests @ git+https://github.com/requests/requests.git@branch_or_tag'
     #   See: https://github.com/pypa/pip/issues/6162
-    install_requires=project_dir.joinpath("requirements.txt").read_text().split("\n"),
+    install_requires=install_requires,
     zip_safe=False,
     license="MIT",
     license_files=["LICENSE.txt"],

{pysimultan-0.2.10 → pysimultan-0.3.0/src/PySimultan.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.2.10
+Version: 0.3.0
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{pysimultan-0.2.10 → pysimultan-0.3.0}/src/PySimultan.egg-info/top_level.txt

@@ -1,2 +1 @@
 PySimultan2
-SOF

{pysimultan-0.2.10 → pysimultan-0.3.0}/src/PySimultan2/default_types.py

@@ -433,6 +433,12 @@ class ComponentDictionary(SimultanObject):
             setter_fcn = self.type_setter_fcn_lookup_dict.get(type(value), set_property_to_unknown_type)
 
         setter_fcn(*fcn_arg_list)
+        item = self.__getitem__(key, check_dict=False)
+
+        # self._object_mapper.create_python_object(self._wrapped_obj)
+        #
+        # if isinstance(value, ):
+
         self._dict[key] = self.__getitem__(key, check_dict=False)
 
     def __delitem__(self, key):
@@ -460,9 +466,9 @@ class ComponentDictionary(SimultanObject):
                                                                              data_model=self._data_model,
                                                                              object_mapper=self._object_mapper)
         for component in self._wrapped_obj.Components.Items:
-            comp_dict[component.Name] = get_obj_value(component,
-                                                      data_model=self._data_model,
-                                                      object_mapper=self._object_mapper)
+            comp_dict[component.Slot.SlotBase.Target.Key] = get_obj_value(component.Component,
+                                                                          data_model=self._data_model,
+                                                                          object_mapper=self._object_mapper)
         for ref_component in self._wrapped_obj.ReferencedComponents.Items:
             comp_dict[ref_component.Slot.SlotBase.Target.Name] = get_obj_value(ref_component.Target,
                                                                                data_model=self._data_model,

{pysimultan-0.2.10 → pysimultan-0.3.0}/src/PySimultan2/utils.py

@@ -380,13 +380,15 @@ def add_sub_component(comp: SimComponent,
             sub_comp.Slots.InsertItem(0, slot)
 
     if slot_extension is None:
-        new_slot = comp.Components.FindAvailableSlot(slot, "{0}")
+        new_slot = comp.Components.FindAvailableSlot(slot.Target if isinstance(slot,
+                                                                               SimTaxonomyEntryReference)
+                                                     else slot, "{0}")
     else:
         new_slot = SimSlot(sub_comp.Slots[0].Target, str(slot_extension))
 
     entry = SimChildComponentEntry(new_slot, sub_comp)
     if entry not in comp.Components.Items:
-        comp.Components.InsertItem(len(comp.Components.Items) + 1, entry)
+        comp.Components.InsertItem(len(comp.Components.Items), entry)
     return True