From 126e6b7443fdfab8e4b5800f90f91e0e9ba5a6d5 Mon Sep 17 00:00:00 2001
From: giginet <giginet.net@gmail.com>
Date: Mon, 18 Jul 2022 13:49:21 +0900
Subject: [PATCH 1/2] Drop 2.7 support
---
.travis.yml | 1 -
setup.py | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index d207905..e1780e3 100644
--- 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/setup.py b/setup.py
index 16ac667..e2257a5 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ setup(
},
classifiers=[
"Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
From e9f37ab20101d7a3fb9ca69e5ee724b83eed6b51 Mon Sep 17 00:00:00 2001
From: giginet <giginet.net@gmail.com>
Date: Mon, 18 Jul 2022 13:49:44 +0900
Subject: [PATCH 2/2] Fix etree deprecation
---
pokedex/db/markdown.py | 3 ++-
setup.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pokedex/db/markdown.py b/pokedex/db/markdown.py
index 4873118..b1414a7 100644
--- a/pokedex/db/markdown.py
+++ b/pokedex/db/markdown.py
@@ -17,8 +17,9 @@ import re
import markdown
import six
from sqlalchemy.orm.session import object_session
-from markdown.util 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
index e2257a5..e728a37 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
install_requires=[
'SQLAlchemy>=1.0,<1.4',
'whoosh>=2.5,<2.7',
- 'markdown>=2.4.1,<=2.6.11',
+ 'markdown>=3.4,<3.5',
'construct==2.5.3',
'six>=1.9.0',
],