Add diff_match_patch dependency again, as the difflib implementation do not work

.travis.yml

@@ -58,7 +58,7 @@ before_install:
   - pip install --upgrade wheel
   # Set numpy version first, other packages link against it
   - pip install six nose coverage codecov pytest pytest-cov coveralls codacy-coverage parameterized secp256k1prp cryptography scrypt
-  - pip install pycryptodomex  ruamel.yaml appdirs pylibscrypt tox asn1crypto
+  - pip install pycryptodomex  ruamel.yaml appdirs pylibscrypt tox asn1crypto diff_match_patch
   - pip install ecdsa requests websocket-client pytz six Click prettytable click_shell
 
 script:

CHANGELOG.rst

 Changelog
 =========
+0.24.15
+-------
+* Add diff_match_patch dependency, as the difflib implementation do not work
+
 0.24.14
 -------
 * Add option add_tor to config storage, which allows it to use beempy in tails

appveyor.yml

@@ -52,7 +52,7 @@ install:
 - cmd: conda install --yes conda-build setuptools pip parameterized cryptography
 - cmd: conda install --yes pycryptodomex ruamel.yaml pytest pytest-mock coverage mock appdirs pylibscrypt pywin32
 - cmd: pip install scrypt -U
-- cmd: conda install --yes ecdsa requests websocket-client pytz six Click prettytable pyinstaller click-shell asn1crypto
+- cmd: conda install --yes ecdsa requests websocket-client pytz six Click prettytable pyinstaller click-shell diff_match_patch asn1crypto
 
 
 build_script:

beem/utils.py

@@ -294,12 +294,12 @@ def remove_from_dict(obj, keys=list(), keep_keys=True):
         return {k: v for k, v in items if k not in keys}
 
 
-def make_patch(a, b, n=3):
-    diffs = difflib.unified_diff(a.splitlines(True),b.splitlines(True),n=0)
-    try: _,_ = next(diffs),next(diffs)
-    except StopIteration: pass
-    # diffs = list(diffs); print(diffs)
-    return ''.join([d if d[-1] == '\n' else d+'\n' for d in diffs])
+def make_patch(a, b):
+    import diff_match_patch as dmp_module
+    dmp = dmp_module.diff_match_patch()
+    patch = dmp.patch_make(a, b)
+    patch_text = dmp.patch_toText(patch)   
+    return patch_text
 
 
 def findall_patch_hunks(body=None):

beem/version.py

 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.24.14'
+version = '0.24.15'

beemapi/version.py

 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.24.14'
+version = '0.24.15'

beembase/version.py

 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.24.14'
+version = '0.24.15'

beemgraphenebase/version.py

 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.24.14'
+version = '0.24.15'

docs/requirements.txt

@@ -7,6 +7,7 @@ pytz
 pycryptodomex>=3.4.6
 scrypt>=0.7.1
 ruamel.yaml
+diff_match_patch
 pytest
 pytest-mock
 coverage

requirements-test.txt

@@ -28,4 +28,5 @@ tox
 codacy-coverage
 virtualenv
 codecov
+diff_match_patch
 asn1crypto
\ No newline at end of file

setup.py

@@ -16,7 +16,7 @@ except LookupError:
     ascii = codecs.lookup('ascii')
     codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
 
-VERSION = '0.24.14'
+VERSION = '0.24.15'
 
 tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
 
@@ -32,6 +32,7 @@ requires = [
     "click_shell",
     "prettytable",
     "ruamel.yaml",
+    "diff_match_patch",
     "asn1crypto"
 ]