Udpate requirements and config.cfg

optional-requirements.txt

@@ -1,4 +1,5 @@
 # GDrive Integration
+google-api-python-client>=1.7.11,<2.36.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -8,14 +9,12 @@ pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
-rsa>=3.4.2,<4.8.0
+rsa>=3.4.2,<4.9.0
 six>=1.10.0,<1.17.0
 
-# Gdrive and Gmail integration
-google-api-python-client>=1.7.11,<2.34.0
-
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
+google-api-python-client>=1.7.11,<2.36.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
@@ -27,15 +26,15 @@ Flask-SimpleLDAP>=1.4.0,<1.5.0
 
 # oauth
 Flask-Dance>=2.0.0,<5.2.0
-SQLAlchemy-Utils>=0.33.5,<0.38.0
+SQLAlchemy-Utils>=0.33.5,<0.39.0
 
-# extracting metadata
+# metadata extraction
 rarfile>=2.7
 scholarly>=1.2.0,<1.6
 
-# other
+# Comics
 natsort>=2.2.0,<8.1.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
-jsonschema>=3.2.0,<4.4.0
+jsonschema>=3.2.0,<4.5.0

requirements.txt

@@ -7,10 +7,10 @@ Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
 PyPDF3>=1.0.0,<1.0.6
 pytz>=2016.10
-requests>=2.11.1,<2.25.0
+requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
 tornado>=4.1,<6.2
 Wand>=0.4.4,<0.7.0
-unidecode>=0.04.19,<1.3.0
-lxml>=3.8.0,<4.7.0
+unidecode>=0.04.19,<1.4.0
+lxml>=3.8.0,<4.8.0
 flask-wtf>=0.14.2,<1.1.0

setup.cfg

@@ -34,6 +34,7 @@ python_requires = >=3.5
 [options.entry_points]
 console_scripts = 
 	cps = calibreweb:main
+
 [options]
 include_package_data = True
 install_requires = 
@@ -46,17 +47,18 @@ install_requires =
 	iso-639>=0.4.5,<0.5.0
 	PyPDF3>=1.0.0,<1.0.6
 	pytz>=2016.10
-    requests>=2.11.1,<2.25.0
+	requests>=2.11.1,<2.28.0
 	SQLAlchemy>=1.3.0,<1.5.0
 	tornado>=4.1,<6.2
 	Wand>=0.4.4,<0.7.0
-    unidecode>=0.04.19,<1.3.0
-    lxml>=3.8.0,<4.7.0
+	unidecode>=0.04.19,<1.4.0
+	lxml>=3.8.0,<4.8.0
 	flask-wtf>=0.14.2,<1.1.0
 	
+
 [options.extras_require]
 gdrive = 
-    google-api-python-client>=1.7.11,<2.34.0
+	google-api-python-client>=1.7.11,<2.36.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -66,11 +68,11 @@ gdrive =
 	pyasn1>=0.1.9,<0.5.0
 	PyDrive2>=1.3.1,<1.11.0
 	PyYAML>=3.12
-    rsa>=3.4.2,<4.8.0
+	rsa>=3.4.2,<4.9.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.34.0
+	google-api-python-client>=1.7.11,<2.36.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0
@@ -79,7 +81,7 @@ ldap =
 	Flask-SimpleLDAP>=1.4.0,<1.5.0
 oauth = 
 	Flask-Dance>=2.0.0,<5.2.0
-    SQLAlchemy-Utils>=0.33.5,<0.38.0
+	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
 	rarfile>=2.7
 	scholarly>=1.2.0,<1.6
@@ -87,7 +89,5 @@ comics =
 	natsort>=2.2.0,<8.1.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
-    jsonschema>=3.2.0,<4.4.0
-
-
+	jsonschema>=3.2.0,<4.5.0