htmldiff2

This commit replaces htmldiff with htmldiff2 which is a friendly fork
that should make diffengine installation easier.

Fixes #57
Fixes #41

README.md

@@ -32,7 +32,7 @@ that can be used for research purposes.
 
 1. install [GeckoDriver]
 1. install [Python 3]
-1. `pip3 install --process-dependency-links diffengine`
+1. `pip3 install diffengine`
 
 ## Run
 

diffengine/__init__.py

@@ -18,9 +18,9 @@
 import tweepy
 import logging
 import argparse
-import htmldiff
 import requests
 import selenium
+import htmldiff2
 import feedparser
 import subprocess
 import readability
@@ -328,7 +328,7 @@ def _generate_diff_html(self):
             return
         tmpl_path = os.path.join(os.path.dirname(__file__), "diff.html")
         logging.debug("creating html diff: %s", self.html_path)
-        diff = htmldiff.render_html_diff(self.old.html, self.new.html)
+        diff = htmldiff2.render_html_diff(self.old.html, self.new.html)
         if "<ins>" not in diff and "<del>" not in diff:
             return False
         tmpl = jinja2.Template(codecs.open(tmpl_path, "r", "utf8").read())

requirements.txt

@@ -8,8 +8,8 @@ pyyaml>=5.1
 tweepy
 requests
 selenium
+htmldiff2
 feedparser
 readability-lxml
-https://github.com/edsu/htmldiff/tarball/master#egg=htmldiff-0.2
 envyaml>=0.1912
 pre-commit==2.3.0

setup.py

@@ -12,12 +12,6 @@
 with open("README.md") as f:
     long_description = f.read()
 
-# hack until htmldiff is updated to work with python3 on pypi
-htmldiff = "https://github.com/edsu/htmldiff/tarball/master#egg=htmldiff-0.2"
-reqs.remove(htmldiff)
-reqs.append("htmldiff==0.2")
-deps = [htmldiff]
-
 if __name__ == "__main__":
     setup(
         name="diffengine",
@@ -29,7 +23,6 @@
         long_description=long_description,
         long_description_content_type="text/markdown",
         install_requires=reqs,
-        dependency_links=deps,
         setup_data={"diffengine": ["diffengine/diff.html"]},
         setup_requires=["pytest-runner"],
         tests_require=["pytest"],