Merge pull request #4500 from pallets/release-2.1.0

release version 2.1.0

CHANGES.rst

@@ -3,7 +3,7 @@
 Version 2.1.0
 -------------
 
-Unreleased
+Released 2022-03-28
 
 -   Drop support for Python 3.6. :pr:`4335`
 -   Update Click dependency to >= 8.0. :pr:`4008`

src/flask/__init__.py

@@ -42,4 +42,4 @@ from .signals import template_rendered as template_rendered
 from .templating import render_template as render_template
 from .templating import render_template_string as render_template_string
 
-__version__ = "2.1.0.dev0"
+__version__ = "2.1.0"

src/flask/wrappers.py

@@ -123,7 +123,7 @@ class Request(RequestBase):
 
             attach_enctype_error_multidict(self)
 
-    def on_json_loading_failed(self, e: ValueError) -> t.Any:
+    def on_json_loading_failed(self, e: t.Optional[ValueError]) -> t.Any:
         try:
             return super().on_json_loading_failed(e)
         except BadRequest as e:

tox.ini

@@ -14,9 +14,10 @@ deps =
     min: -r requirements/tests-pallets-min.txt
     dev: -r requirements/tests-pallets-dev.txt
 
-    examples/tutorial[test]
-    examples/javascript[test]
-commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs:tests examples}
+#    examples/tutorial[test]
+#    examples/javascript[test]
+# commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs:tests examples}
+commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs:tests}
 
 [testenv:style]
 deps = pre-commit