mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-03 15:00:01 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source
This commit is contained in:
Ozzie Isaacs 2021-05-16 09:03:58 +02:00
commit 109198a374
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
optional-requirements.txt
View File

@ -1,15 +1,15 @@
# GDrive Integration # GDrive Integration
gevent>20.6.0,<21.2.0 gevent>20.6.0,<21.2.0
greenlet>=0.4.17,<1.1.0 greenlet>=0.4.17,<1.2.0
httplib2>=0.9.2,<0.18.0 httplib2>=0.9.2,<0.20.0
oauth2client>=4.0.0,<4.1.4 oauth2client>=4.0.0,<4.1.4
uritemplate>=3.0.0,<3.1.0 uritemplate>=3.0.0,<3.1.0
pyasn1-modules>=0.0.8,<0.3.0 pyasn1-modules>=0.0.8,<0.3.0
pyasn1>=0.1.9,<0.5.0 pyasn1>=0.1.9,<0.5.0
PyDrive2>=1.3.1,<1.8.0 PyDrive2>=1.3.1,<1.9.0
PyYAML>=3.12 PyYAML>=3.12
rsa>=3.4.2,<4.1.0 rsa>=3.4.2,<4.8.0
six>=1.10.0,<1.15.0 six>=1.10.0,<1.17.0
# Gdrive and Gmail integration # Gdrive and Gmail integration
google-api-python-client>=1.7.11,<2.1.0 google-api-python-client>=1.7.11,<2.1.0
@ -26,7 +26,7 @@ python-ldap>=3.0.0,<3.4.0
Flask-SimpleLDAP>=1.4.0,<1.5.0 Flask-SimpleLDAP>=1.4.0,<1.5.0
#oauth #oauth
Flask-Dance>=1.4.0,<4.1.0 Flask-Dance>=2.0.0,<5.1.0
SQLAlchemy-Utils>=0.33.5,<0.38.0 SQLAlchemy-Utils>=0.33.5,<0.38.0
# extracting metadata # extracting metadata
@ -34,7 +34,7 @@ lxml>=3.8.0,<4.7.0
rarfile>=2.7 rarfile>=2.7
# other # other
natsort>=2.2.0,<7.1.0 natsort>=2.2.0,<7.2.0
comicapi>= 2.2.0,<2.3.0 comicapi>= 2.2.0,<2.3.0
#Kobo integration #Kobo integration

8
requirements.txt
View File

@ -1,14 +1,14 @@
Babel>=1.3, <2.9 Babel>=1.3, <3.0
Flask-Babel>=0.11.1,<2.1.0 Flask-Babel>=0.11.1,<2.1.0
Flask-Login>=0.3.2,<0.5.1 Flask-Login>=0.3.2,<0.5.1
Flask-Principal>=0.3.2,<0.5.1 Flask-Principal>=0.3.2,<0.5.1
backports_abc>=0.4 backports_abc>=0.4
Flask>=1.0.2,<1.2.0 Flask>=1.0.2,<2.1.0
iso-639>=0.4.5,<0.5.0 iso-639>=0.4.5,<0.5.0
PyPDF3>=1.0.0,<1.0.4 PyPDF3>=1.0.0,<1.0.4
pytz>=2016.10 pytz>=2016.10
requests>=2.11.1,<2.25.0 requests>=2.11.1,<2.25.0
SQLAlchemy>=1.3.0,<1.4.0 # oauth fails on 1.4+ due to import problems in flask_dance SQLAlchemy>=1.3.0,<1.5.0
tornado>=4.1,<6.2 tornado>=4.1,<6.2
Wand>=0.4.4,<0.7.0 Wand>=0.4.4,<0.7.0
unidecode>=0.04.19,<1.2.0 unidecode>=0.04.19,<1.3.0

31
setup.cfg
View File

@ -34,35 +34,38 @@ console_scripts =
[options] [options]
include_package_data = True include_package_data = True
install_requires = install_requires =
Babel>=1.3, <2.9 Babel>=1.3, <3.0
Flask-Babel>=0.11.1,<2.1.0 Flask-Babel>=0.11.1,<2.1.0
Flask-Login>=0.3.2,<0.5.1 Flask-Login>=0.3.2,<0.5.1
Flask-Principal>=0.3.2,<0.5.1 Flask-Principal>=0.3.2,<0.5.1
backports_abc>=0.4 backports_abc>=0.4
Flask>=1.0.2,<1.2.0 Flask>=1.0.2,<2.1.0
iso-639>=0.4.5,<0.5.0 iso-639>=0.4.5,<0.5.0
PyPDF3>=1.0.0,<1.0.4 PyPDF3>=1.0.0,<1.0.4
pytz>=2016.10 pytz>=2016.10
requests>=2.11.1,<2.25.0 requests>=2.11.1,<2.25.0
SQLAlchemy>=1.3.0,<1.4.0 SQLAlchemy>=1.3.0,<1.5.0
tornado>=4.1,<6.2 tornado>=4.1,<6.2
Wand>=0.4.4,<0.7.0 Wand>=0.4.4,<0.7.0
unidecode>=0.04.19,<1.2.0 unidecode>=0.04.19,<1.3.0
[options.extras_require] [options.extras_require]
gdrive = gdrive =
google-api-python-client>=1.7.11,<1.13.0 google-api-python-client>=1.7.11,<2.1.0
gevent>20.6.0,<21.2.0 gevent>20.6.0,<21.2.0
greenlet>=0.4.17,<1.1.0 greenlet>=0.4.17,<1.2.0
httplib2>=0.9.2,<0.18.0 httplib2>=0.9.2,<0.20.0
oauth2client>=4.0.0,<4.1.4 oauth2client>=4.0.0,<4.1.4
uritemplate>=3.0.0,<3.1.0 uritemplate>=3.0.0,<3.1.0
pyasn1-modules>=0.0.8,<0.3.0 pyasn1-modules>=0.0.8,<0.3.0
pyasn1>=0.1.9,<0.5.0 pyasn1>=0.1.9,<0.5.0
PyDrive2>=1.3.1,<1.8.0 PyDrive2>=1.3.1,<1.9.0
PyYAML>=3.12 PyYAML>=3.12
rsa>=3.4.2,<4.1.0 rsa>=3.4.2,<4.8.0
six>=1.10.0,<1.15.0 six>=1.10.0,<1.17.0
gmail =
google-auth-oauthlib>=0.4.3,<0.5.0
google-api-python-client>=1.7.11,<2.1.0
goodreads = goodreads =
goodreads>=0.3.2,<0.4.0 goodreads>=0.3.2,<0.4.0
python-Levenshtein>=0.12.0,<0.13.0 python-Levenshtein>=0.12.0,<0.13.0
@ -70,14 +73,14 @@ ldap =
python-ldap>=3.0.0,<3.4.0 python-ldap>=3.0.0,<3.4.0
Flask-SimpleLDAP>=1.4.0,<1.5.0 Flask-SimpleLDAP>=1.4.0,<1.5.0
oauth = oauth =
Flask-Dance>=1.4.0,<3.1.0 Flask-Dance>=2.0.0,<5.1.0
SQLAlchemy-Utils>=0.33.5,<0.37.0 SQLAlchemy-Utils>=0.33.5,<0.38.0
metadata = metadata =
lxml>=3.8.0,<4.7.0 lxml>=3.8.0,<4.7.0
rarfile>=2.7 rarfile>=2.7
comics = comics =
natsort>=2.2.0,<7.1.0 natsort>=2.2.0,<7.2.0
comicapi>= 2.1.3,<2.2.0 comicapi>= 2.2.0,<2.3.0
kobo = kobo =
jsonschema>=3.2.0,<3.3.0 jsonschema>=3.2.0,<3.3.0