Merge pull request #1659 from e2nIEE/develop

version 2.10.1: fix for JSONSerializableClass
e2nIEE · Jul 31, 2022 · 1a85fdf · 1a85fdf
2 parents d49abec + 5b672b0
commit 1a85fdf
Show file tree

Hide file tree

Showing 6 changed files with 1,823 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Change Log
 =============
 
+[2.10.1] - 2022-07-31
+-------------------------------
+- [FIXED] remove the parameter ignore_order in DeepDiff (__eq__), add __hash__ to JSONSerializableClass
+
 [2.10.0] - 2022-07-29
 -------------------------------
 - [ADDED] added arbitrary keyword arguments, ``**kwargs``, in all create-functions

diff --git a/doc/conf.py b/doc/conf.py
@@ -56,7 +56,7 @@
 # The short X.Y version.
 version = "2.10"
 # The full version, including alpha/beta/rc tags.
-release = "2.10.0"
+release = "2.10.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pandapower/__init__.py b/pandapower/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.10.0"
+__version__ = "2.10.1"
 
 import os
 pp_dir = os.path.dirname(os.path.realpath(__file__))

diff --git a/pandapower/io_utils.py b/pandapower/io_utils.py
@@ -771,10 +771,15 @@ def __eq__(self, other):
         if self.__class__.__name__ != other.__class__.__name__:
             return False
         else:
-            d = DeepDiff(self.__dict__, other.__dict__, ignore_order=True, ignore_nan_inequality=True,
+            d = DeepDiff(self.__dict__, other.__dict__, ignore_nan_inequality=True,
                          significant_digits=6, math_epsilon=1e-6, ignore_private_variables=False)
             return len(d) == 0
 
+    def __hash__(self):
+        # for now we use the address of the object for hash, but we can change it in the future
+        # to be based on the attributes e.g. with DeepHash or similar
+        return hash(id(self))
+
 
 def with_signature(obj, val, obj_module=None, obj_class=None):
     if obj_module is None:

diff --git a/pandapower/test/test_files/old_versions/example_2.10.1.json b/pandapower/test/test_files/old_versions/example_2.10.1.json
diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
 
 setup(
     name='pandapower',
-    version='2.10.0',
+    version='2.10.1',
     author='Leon Thurner, Alexander Scheidler',
     author_email='[email protected], [email protected]',
     description='An easy to use open source tool for power system modeling, analysis and optimization with a high degree of automation.',