maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge pull request #4500 from pallets/release-2.1.0

Browse source 
release version 2.1.0
This commit is contained in:
David Lord 2022-03-28 12:12:02 -07:00 • committed by GitHub
commit 65b0eef303
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.rst
View file

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

2
src/flask/__init__.py
View file

@ -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 as render_template
from .templating import render_template_string as render_template_string from .templating import render_template_string as render_template_string
__version__ = "2.1.0.dev0" __version__ = "2.1.0"

2
src/flask/wrappers.py
View file

@ -123,7 +123,7 @@ class Request(RequestBase):
attach_enctype_error_multidict(self) 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: try:
return super().on_json_loading_failed(e) return super().on_json_loading_failed(e)
except BadRequest as e: except BadRequest as e:

7
tox.ini
View file

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