Fixed #6

cophi-wue · Oct 10, 2020 · d022f42 · d022f42
1 parent daaffc4
commit d022f42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/delta/util.py b/delta/util.py
@@ -80,7 +80,7 @@ def update(self, *args, **kwargs):
                 self._update_from(arg.metadata.__dict__)
             elif isinstance(arg, str):
                 self._update_from(json.loads(arg))
-            else:
+            elif arg is not None:
                 self._update_from(arg)
         self._update_from(kwargs)
 

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
         'scipy>=0.14.0',
         'matplotlib>=1.3.1',
         'numpy>=1.8.1',
-        'pandas>=0.13.1,<1.0',          # https://github.com/cophi-wue/pydelta/issues/6
+        'pandas>=0.13.1',          # https://github.com/cophi-wue/pydelta/issues/6
 #        'profig>=0.2.8',
         'scikit-learn>=0.16.0',
         'regex'