Commit d01a0c66 authored by Ozzieisaacs's avatar Ozzieisaacs

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	optional-requirements.txt
parents d168e3bf b1bb1cfd
...@@ -11,24 +11,13 @@ PyDrive==1.3.1 ...@@ -11,24 +11,13 @@ PyDrive==1.3.1
PyYAML==3.12 PyYAML==3.12
rsa==3.4.2 rsa==3.4.2
six==1.10.0 six==1.10.0
# goodreads # goodreads
goodreads>=0.3.2 goodreads>=0.3.2
python-Levenshtein>=0.12.0 python-Levenshtein>=0.12.0
#extracting metadata
# ldap login
python_ldap>=3.0.0
flask-simpleldap>=1.2.0
# extracting metadata
lxml>=3.8.0 lxml>=3.8.0
Pillow>=4.0.0 Pillow>=4.0.0
rarfile>=2.7 rarfile>=2.7
# other # other
natsort>=2.2.0 natsort>=2.2.0
git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi git+https://github.com/OzzieIsaacs/comicapi/archive/5346716578b2843f54d522f44d01bc8d25001d24.zip#egg=comicapi
# Oauth Login
flask-dance>=0.13.0
sqlalchemy_utils>=0.33.5
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment