veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge e9f37ab201 into cc483e1877

Browse source
This commit is contained in:
Kohki Miki 2022-07-21 12:49:22 +00:00 • committed by GitHub
commit f037497b46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

1
.travis.yml
View file

@ -1,7 +1,6 @@
os: linux os: linux
language: python language: python
python: python:
- "2.7"
- "3.4" - "3.4"
- "3.5" - "3.5"
- "3.6" - "3.6"

3
pokedex/db/markdown.py
View file

@ -17,8 +17,9 @@ import re
import markdown import markdown
import six import six
from sqlalchemy.orm.session import object_session 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 @six.python_2_unicode_compatible
class MarkdownString(object): class MarkdownString(object):

3
setup.py
View file

@ -11,7 +11,7 @@ setup(
install_requires=[ install_requires=[
'SQLAlchemy>=1.0,<1.4', 'SQLAlchemy>=1.0,<1.4',
'whoosh>=2.5,<2.7', 'whoosh>=2.5,<2.7',
'markdown>=2.4.1,<=2.6.11', 'markdown>=3.4,<3.5',
'construct==2.5.3', 'construct==2.5.3',
'six>=1.9.0', 'six>=1.9.0',
], ],
@ -22,6 +22,7 @@ setup(
}, },
classifiers=[ classifiers=[
"Programming Language :: Python :: 2.7", "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.7",