Merge branch 'master' into release-2.1.1

mediumTaj · web-flow · commit f7b9cffc8758 · 2018-09-21T12:28:28.000-05:00
diff --git a/setup.py b/setup.py
@@ -33,10 +33,10 @@
 
 # Convert README.md to README.rst for pypi
 try:
-    from pypandoc import convert
+    from pypandoc import convert_file
 
     def read_md(f):
-        return convert(f, 'rst')
+        return convert_file(f, 'rst')
 
     # read_md = lambda f: convert(f, 'rst')
 except:
