[allura] 04/04: [#8367] switch to mediawiki fork with py3 compatibility

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8367
in repository https://gitbox.apache.org/repos/asf/allura.git

commit fc97c0d4b161cf9d44b34bec4b0086a508b4144d
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Wed Jun 17 17:25:13 2020 -0400

    [#8367] switch to mediawiki fork with py3 compatibility
---
 ForgeWiki/forgewiki/converters.py | 4 ++--
 requirements-optional.txt         | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ForgeWiki/forgewiki/converters.py b/ForgeWiki/forgewiki/converters.py
index 072a178..45dae98 100644
--- a/ForgeWiki/forgewiki/converters.py
+++ b/ForgeWiki/forgewiki/converters.py
@@ -65,8 +65,8 @@ def mediawiki2markdown(source):
         from mediawiki import wiki2html
     except ImportError:
         raise ImportError("""This operation requires GPL libraries:
-        "mediawiki" (https://github.com/zikzakmedia/python-mediawiki.git)
-        "html2text" (https://github.com/aaronsw/html2text.git)""")
+        "mediawiki" (https://pypi.org/project/mediawiki2html/)
+        "html2text" (https://pypi.org/project/html2text/)""")
 
     html2text.BODY_WIDTH = 0
 
diff --git a/requirements-optional.txt b/requirements-optional.txt
index 36ba703..037b5d4 100644
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -5,8 +5,7 @@
 html2text==2019.8.11  # last to support py2
 
 # for ForgeWiki's mediawiki importer:
--e git://github.com/zikzakmedia/python-mediawiki.git#egg=python-mediawiki   # GPL
-MySQL-python  # GPL
+mediawiki2html  # GPL
 
 # for spam checking
 akismet==1.0.1