Merge pull request #4500 from pallets/release-2.1.0

release version 2.1.0
pallets · Mar 28, 2022 · 65b0eef · 65b0eef
2 parents 41aaaf7 + 7d264d7
commit 65b0eef
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CHANGES.rst b/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`

diff --git a/src/flask/__init__.py b/src/flask/__init__.py
@@ -42,4 +42,4 @@
 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"
diff --git a/src/flask/wrappers.py b/src/flask/wrappers.py
@@ -123,7 +123,7 @@ def _load_form_data(self) -> None:
 
             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:

diff --git a/tox.ini b/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