Updated Translation

Version bump
Fixed errors in requirements file(s)

cps/__init__.py

@@ -100,8 +100,8 @@ def create_app():
 
     log.info('Starting Calibre Web...')
     if sys.version_info < (3, 0):
-        log.info('Python2 is EOL since end of 2020, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
-        print('Python2 is EOL since end of 2020, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
+        log.info('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
+        print('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
     Principal(app)
     lm.init_app(app)
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))

cps/constants.py

@@ -130,7 +130,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages')
 
-STABLE_VERSION = {'version': '0.6.10 Beta'}
+STABLE_VERSION = {'version': '0.6.10'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'

optional-requirements.txt

@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client==1.7.11,<1.8.0
+google-api-python-client>=1.7.11,<1.8.0
 gevent>=1.2.1,<20.6.0
 greenlet>=0.4.12,<0.4.17
 httplib2>=0.9.2,<0.18.0
@@ -9,7 +9,7 @@ pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.8.0
 PyYAML>=3.12
-rsa==3.4.2,<4.1.0
+rsa>=3.4.2,<4.1.0
 six>=1.10.0,<1.15.0
 
 # goodreads
@@ -30,7 +30,7 @@ rarfile>=2.7
 
 # other
 natsort>=2.2.0,<7.1.0
-git+https://github.com/OzzieIsaacs/comicapi.git@7aa91ea95ea7a919df6c6cac817865434a31c228#egg=comicapi
+comicapi>= 2.1.3,<2.2.0
 
 #Kobo integration
 jsonschema>=3.2.0,<3.3.0

requirements.txt

@@ -6,7 +6,7 @@ singledispatch>=3.4.0.0,<3.5.0.0
 backports_abc>=0.4
 Flask>=1.0.2,<1.2.0
 iso-639>=0.4.5,<0.5.0
-PyPDF2==1.26.0,<1.27.0
+PyPDF2>=1.26.0,<1.27.0
 pytz>=2016.10
 requests>=2.11.1,<2.25.0
 SQLAlchemy>=1.3.0,<1.4.0

setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
 name = calibreweb
 url = https://github.com/janeczku/calibre-web
@@ -20,7 +17,6 @@ license_file = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     License :: OSI Approved :: GNU Affero General Public License v3
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
@@ -30,57 +26,61 @@ keywords =
   calibre
   calibre-web
   library
-python_requires = >=2.6
+python_requires = >=3.0
 
 [options.entry_points]
 console_scripts =
   cps = calibreweb:main
 [options]
 include_package_data = True
-dependency_links = comicapi @ git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi
 install_requires =
-  Babel >= 1.3
-  Flask-Babel >= 0.11.1
-  Flask-Login >= 0.3.2
-  Flask-Principal >= 0.3.2
-  singledispatch >= 3.4.0.0
-  backports_abc >= 0.4
-  Flask >= 0.11
-  iso-639 >= 0.4.5
-  PyPDF2 == 1.26.0
-  pytz >= 2016.10
-  requests >= 2.11.1
-  SQLAlchemy >= 1.1.0
-  tornado >= 4.1
-  unidecode >= 0.04.19
+    Babel>=1.3, <2.9
+    Flask-Babel>=0.11.1,<2.1.0
+    Flask-Login>=0.3.2,<0.5.1
+    Flask-Principal>=0.3.2,<0.5.1
+    singledispatch>=3.4.0.0,<3.5.0.0
+    backports_abc>=0.4
+    Flask>=1.0.2,<1.2.0
+    iso-639>=0.4.5,<0.5.0
+    PyPDF2>=1.26.0,<1.27.0
+    pytz>=2016.10
+    requests>=2.11.1,<2.25.0
+    SQLAlchemy>=1.3.0,<1.4.0
+    tornado>=4.1,<6.2
+    Wand>=0.4.4,<0.7.0
+    unidecode>=0.04.19,<1.2.0
 
 [options.extras_require]
 gdrive =
-  google-api-python-client == 1.6.1
-  google-api-python-client==1.6.1
-  gevent==1.2.1
-  greenlet==0.4.12
-  httplib2==0.9.2
-  oauth2client==4.0.0
-  uritemplate==3.0.0
-  pyasn1-modules==0.0.8
-  pyasn1==0.1.9
-  PyDrive==1.3.1
-  PyYAML==3.12
-  rsa==3.4.2
-  six==1.10.0
+    google-api-python-client>=1.7.11,<1.8.0
+    gevent>=1.2.1,<20.6.0
+    greenlet>=0.4.12,<0.4.17
+    httplib2>=0.9.2,<0.18.0
+    oauth2client>=4.0.0,<4.1.4
+    uritemplate>=3.0.0,<3.1.0
+    pyasn1-modules>=0.0.8,<0.3.0
+    pyasn1>=0.1.9,<0.5.0
+    PyDrive2>=1.3.1,<1.8.0
+    PyYAML>=3.12
+    rsa>=3.4.2,<4.1.0
+    six>=1.10.0,<1.15.0
 goodreads =
-  goodreads >= 0.3.2
-  python-Levenshtein>=0.12.0
+    goodreads>=0.3.2,<0.4.0
+    python-Levenshtein>=0.12.0,<0.13.0
+ldap =
+    python-ldap>=3.0.0,<3.3.0
+    Flask-SimpleLDAP>=1.4.0,<1.5.0
+oauth =
+    Flask-Dance>=1.4.0,<3.1.0
+    SQLAlchemy-Utils>=0.33.5,<0.37.0
 metadata =
-  lxml>=3.8.0
-  Pillow>=4.0.0
-  rarfile>=2.7
-  Wand >= 0.4.4
-comics=
-  natsort>=2.2.0
-  # find solution for this should belong to comics
-  # comicapi @ git+https://github.com/OzzieIsaacs/comicapi/archive/5346716578b2843f54d522f44d01bc8d25001d24.zip#egg=comicapi
+    lxml>=3.8.0,<4.6.0
+    rarfile>=2.7
+comics =
+    natsort>=2.2.0
+    comicapi>= 2.1.3,<2.2.0
+kobo =
+    jsonschema>=3.2.0,<3.3.0