Merge pull request #88 from DonHaul/dictdiffer-bump

bump: update dictdiffer origin

Author: ioannistsanaktsidis

json_merger/dict_merger.py

@@ -28,8 +28,8 @@
 import logging
 
 import six
-from dictdiffer import ADD, CHANGE, REMOVE, patch
-from dictdiffer.merge import Merger, UnresolvedConflictsException
+from inspire_dictdiffer import ADD, CHANGE, REMOVE, patch
+from inspire_dictdiffer.merge import Merger, UnresolvedConflictsException
 
 from .config import DictMergerOps
 from .conflict import Conflict, ConflictType

setup.py

@@ -59,7 +59,7 @@
     extras_require['all'].extend(reqs)
 
 install_requires = [
-    'dictdiffer==0.8.1' if version_info <= (2, 7) else 'dictdiffer>=0.6.0',
+    'inspire-dictdiffer',
     'six>=1.10.0',
     'pyrsistent>=0.11.13'
 ]

tests/unit/test_dict_merger.py

@@ -30,7 +30,7 @@
 
 from json_merger.config import DictMergerOps
 from json_merger.conflict import Conflict, ConflictType
-from dictdiffer.conflict import Conflict as Dictdiffer_Conflict
+from inspire_dictdiffer.conflict import Conflict as Dictdiffer_Conflict
 from json_merger.dict_merger import SkipListsMerger
 from json_merger.errors import MergeError
 from json_merger.nothing import NOTHING