Merge pull request #113 from giginet/update-markdown

PokeAPI · Jul 22, 2022 · 510059e · 510059e
2 parents f9e4a16 + 20f57cf
commit 510059e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 os: linux
 language: python
 python:
-    - "2.7"
     - "3.4"
     - "3.5"
     - "3.6"

diff --git a/pokedex/db/markdown.py b/pokedex/db/markdown.py
@@ -16,12 +16,8 @@
 import markdown
 import six
 from sqlalchemy.orm.session import object_session
-try:
-    # Markdown 2.1+
-    from markdown.util import etree, AtomicString
-except ImportError:
-    # Old Markdown
-    from markdown import etree, AtomicString
+from markdown.util import AtomicString
+import xml.etree.ElementTree as etree 
 
 @six.python_2_unicode_compatible
 class MarkdownString(object):

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     install_requires=[
         'SQLAlchemy>=1.0,<2.0',
         'whoosh>=2.5,<2.7',
-        'markdown==2.4.1',
+        'markdown>=3.4,<3.5',
         'construct==2.5.3',
         'six>=1.9.0',
     ],
@@ -21,7 +21,6 @@
         ],
     },
     classifiers=[
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.7",