Merge branch 'master' into cover_thumbnail

# Conflicts:
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html

setup.cfg

@@ -39,6 +39,7 @@ console_scripts =
 include_package_data = True
 install_requires = 
 	APScheduler>=3.6.3,<3.8.0
+	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
 	Flask-Login>=0.3.2,<0.5.1
@@ -56,6 +57,7 @@ install_requires =
 	lxml>=3.8.0,<4.8.0
 	flask-wtf>=0.14.2,<1.1.0
 	chardet>=3.0.0,<4.1.0
+	advocate>=1.0.0,<1.1.0
 	
 
 [options.extras_require]
@@ -72,7 +74,7 @@ gdrive =
 	PyYAML>=3.12
 	rsa>=3.4.2,<4.9.0
 gmail = 
-	google-auth-oauthlib>=0.4.3,<0.5.0
+	google-auth-oauthlib>=0.4.3,<0.6.0
 	google-api-python-client>=1.7.11,<2.43.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
@@ -85,7 +87,7 @@ oauth =
 	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
 	rarfile>=3.2
-	scholarly>=1.2.0,<1.6
+	scholarly>=1.2.0,<1.7
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0