Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update python-markdown #369

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update python-markdown #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
126e6b7
Drop 2.7 support
giginet Jul 18, 2022
e9f37ab
Fix etree deprecation
giginet Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
os: linux
language: python
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
Expand Down
3 changes: 2 additions & 1 deletion pokedex/db/markdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
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):
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
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',
],
Expand All @@ -22,6 +22,7 @@
},
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",
Expand Down