Update type hints for new flask version.

Author: domdfcoding

dependency_dash/_app.py

@@ -36,7 +36,7 @@
 
 # 3rd party
 from domdf_python_tools.paths import PathPlus
-from flask import Flask, Response, redirect, request, url_for  # type: ignore[import]
+from flask import Flask, Response, redirect, request, url_for
 from flask_restx import Api  # type: ignore[import]
 from wtforms import Form, StringField  # type: ignore[import]
 
@@ -82,17 +82,22 @@ def https_redirect() -> Optional[Response]:
 	if request.scheme != "http":
 		return None
 
-	return redirect(
+	view_args: Dict[str, Any] = request.view_args or {}
+	args: Dict[str, Any] = dict(request.args or {})
+
+	retval = redirect(
 			url_for(
 					request.endpoint,
 					_scheme="https",
 					_external=True,
-					**(request.view_args or {}),
-					**(request.args or {}),
+					**view_args,
+					**args,
 					),
 			HTTPStatus.PERMANENT_REDIRECT,
 			)
 
+	return retval  # type: ignore[return-value]
+
 
 if "ON_HEROKU" in os.environ:
 	app.before_request(https_redirect)

dependency_dash/github/__init__.py

@@ -44,9 +44,9 @@
 import github3.repos.contents
 import platformdirs
 import requests
-import setup_py_upgrade  # type: ignore
+import setup_py_upgrade  # type: ignore[import]
 from domdf_python_tools.paths import PathPlus
-from flask import Response, render_template, request  # type: ignore
+from flask import Response, render_template, request
 from github3.orgs import Organization
 from github3.repos import ShortRepository
 from github3.users import User
@@ -57,7 +57,7 @@
 # this package
 from dependency_dash._app import app
 from dependency_dash.github._env import GITHUB
-from dependency_dash.github.api import GitHubProjectAPI
+from dependency_dash.github.api import GitHubProjectAPI  # noqa: F401
 from dependency_dash.htmx import htmx
 from dependency_dash.pypi import format_project_links, get_dependency_status, make_badge
 
@@ -348,7 +348,7 @@ def get_repo_requirements(
 
 
 @app.route("/github/<username>/<repository>/")
-def github_project(username: str, repository: str):
+def github_project(username: str, repository: str) -> Response:
 	"""
 	Route for displaying information about a single github repository.
 
@@ -361,17 +361,22 @@ def github_project(username: str, repository: str):
 	try:
 		repo = GITHUB.repository(username, repository)
 	except github3.exceptions.NotFoundError:
-		return render_template(
-			"project_404.html",
-			project_name=project_name,
-			description=f"Dependency status for https://github.com/{project_name}",
-			), 404
+		return Response(
+				render_template(
+						"project_404.html",
+						project_name=project_name,
+						description=f"Dependency status for https://github.com/{project_name}",
+						),
+				404
+				)
 
-	return render_template(
-			"project.html",
-			project_name=repo.full_name,
-			data_url=f"/htmx/github/{repo.full_name}/{repo.default_branch}",
-			description=f"Dependency status for https://github.com/{repo.full_name}",
+	return Response(
+			render_template(
+					"project.html",
+					project_name=repo.full_name,
+					data_url=f"/htmx/github/{repo.full_name}/{repo.default_branch}",
+					description=f"Dependency status for https://github.com/{repo.full_name}",
+					)
 			)
 
 
@@ -504,7 +509,7 @@ def htmx_github_user(username: str) -> str:
 		except (InvalidRequirement, InvalidVersion):
 			return render_template("repository_status.html", status="invalid")
 
-	page = request.args.get("page", 1)
+	page = int(request.args.get("page", 1))
 
 	try:
 		user = GITHUB.user(username)
@@ -679,3 +684,19 @@ def get_our_config(
 			}
 	datafile.dump_json(data)
 	return files
+
+
+#
+# def parse_config():
+# 	"""
+#
+# 	Possible syntax:
+#
+# 	* Filename to ``requirements.txt``-style.
+# 	* ``setup.cfg`` -- to consider the library requirements
+# 	# * ``setup.cfg[extra1, extra2]`` -- to consider the extras with the given name
+# 	* ``pyproject.toml`` -- to consider the library requirements
+# 	# * ``pyproject.toml[extra1, extra2]`` -- to consider the extras with the given name
+#
+# 	:return:
+# 	"""

dependency_dash/github/api.py

@@ -79,7 +79,7 @@ class GitHubProjectAPI(Resource):
 	@api.response(200, "Success", github_project_model)
 	@api.response(404, "Repository not found or no supported files in repository.")
 	@api.doc(id="get_github_project")
-	def get(self, username: str, repository: str):
+	def get(self, username: str, repository: str) -> Tuple[Dict, int]:
 		"""
 		Returns a JSON response, giving the status for each of the repository's dependencies.
 		"""
@@ -111,11 +111,11 @@ def get(self, username: str, repository: str):
 					req_data["current_version"] = req_data.pop("version")
 					output[filename].append({"requirement": str(req), "status": status, **req_data})
 
-			return output
+			return output, 200
 
 
 @app.route("/api/<path:path>")
-def api_error_404(path: str):
+def api_error_404(path: str) -> Tuple[Dict[str, str], int]:
 	return {
 		"message": "Not Found",
 		"documentation_url": urljoin(app.config["DD_ROOT_URL"], "/api"),

dependency_dash/htmx.py

@@ -35,7 +35,7 @@
 from urllib.parse import urljoin
 
 # 3rd party
-from flask import Flask, render_template  # type: ignore[import]
+from flask import Flask, render_template
 
 __all__ = ["htmx"]
 

dependency_dash/pypi/__init__.py

@@ -35,7 +35,7 @@
 # 3rd party
 import platformdirs
 from domdf_python_tools.paths import PathPlus
-from flask import render_template  # type: ignore[import]
+from flask import render_template
 from packaging.version import InvalidVersion, Version
 from pybadges import badge
 from pypi_json import PyPIJSON
@@ -128,14 +128,19 @@ def get_data(project_name: str) -> Dict[str, Any]:
 		with PyPIJSON() as client:
 			metadata = client.get_metadata(project_name)
 
+		releases = metadata.releases
+		# .releases may be None if a version is passed,
+		# but in our case we aren't.
+		assert releases is not None
+
 		data = {
 				"name": metadata.info["name"],
 				"version": metadata.info["version"],
 				"home_page": metadata.info["home_page"] or '',
 				"license": metadata.info["license"] or '',
 				"package_url": metadata.info["package_url"],
 				"project_urls": metadata.info["project_urls"],
-				"all_versions": _sort_versions(*metadata.releases.keys()),
+				"all_versions": _sort_versions(*releases.keys()),
 				}
 
 		datafile.dump_json(data)

dependency_dash/routes.py

@@ -30,10 +30,10 @@
 from typing import Tuple
 
 # 3rd party
-import jinja2  # type: ignore[import]
+import jinja2
 import markdown
 from domdf_python_tools.compat import importlib_resources
-from flask import Response, make_response, redirect, render_template, request  # type: ignore[import]
+from flask import Response, make_response, redirect, render_template, request
 from markdown.inlinepatterns import IMAGE_LINK_RE, ImageInlineProcessor
 
 # this package
@@ -143,7 +143,10 @@ def search() -> Response:
 	Only accepts POST requests.
 	"""
 
-	return redirect(f"/github/{GoToForm(request.form).data['search']}", code=302)
+	return redirect(  # type: ignore[return-value]
+			f"/github/{GoToForm(request.form).data['search']}",
+			code=302,
+			)
 
 
 @app.errorhandler(404)