Merge branch 'Develop'
# Conflicts: # cps/__init__.py # cps/about.py # cps/admin.py # cps/cli.py # cps/config_sql.py # cps/constants.py # cps/converter.py # cps/db.py # cps/editbooks.py # cps/gdriveutils.py # cps/helper.py # cps/logger.py # cps/oauth.py # cps/server.py # cps/services/simpleldap.py # cps/ub.py # cps/web.py # cps/worker.py # optional-requirements.txt # setup.cfg # setup.py
Showing
... | @@ -11,13 +11,20 @@ PyDrive==1.3.1 | ... | @@ -11,13 +11,20 @@ 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 | |||
# 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.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi |
Please
register
or
sign in
to comment