8000 Merge pull request #4007 from pallets/release-2.0.0 · pallets/flask@2f0c62f · GitHub
[go: up one dir, main page]
Skip to content

Commit 2f0c62f

Browse files
davidismdavidism
authored
Merge pull request #4007 from pallets/release-2.0.0
Release 2.0.0
2 parents 9c1e7f6 + f8e63d3 commit 2f0c62f

File tree

13 files changed

+60
-49
lines changed

13 files changed

+60
-49
lines changed

‎CHANGES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Version 2.0.0
44
-------------
55

6-
Unreleased
6+
Released 2021-05-11
77

88
- Drop support for Python 2 and 3.5.
99
- Bump minimum versions of other Pallets projects: Werkzeug >= 2,

‎requirements/dev.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
-r docs.in
22
-r tests.in
3+
-r typing.in
34
pip-tools
45
pre-commit
56
tox

‎requirements/dev.txt

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ appdirs==1.4.4
1010
# via virtualenv
1111
asgiref==3.3.4
1212
# via -r requirements/tests.in
13-
attrs==20.3.0
13+
attrs==21.2.0
1414
# via pytest
15-
babel==2.9.0
15+
babel==2.9.1
1616
# via sphinx
1717
blinker==1.4
1818
# via -r requirements/tests.in
@@ -22,19 +22,21 @@ cfgv==3.2.0
2222
# via pre-commit
2323
chardet==4.0.0
2424
# via requests
25-
click==7.1.2
25+
click==8.0.0
2626
# via pip-tools
2727
distlib==0.3.1
2828
# via virtualenv
2929
docutils==0.16
30-
# via sphinx
30+
# via
31+
# sphinx
32+
# sphinx-tabs
3133
filelock==3.0.12
3234
# via
3335
# tox
3436
# virtualenv
35-
greenlet==1.0.0
37+
greenlet==1.1.0
3638
# via -r requirements/tests.in
37-
identify==2.2.3
39+
identify==2.2.4
3840
# via pre-commit
3941
idna==2.10
4042
# via requests
@@ -45,7 +47,13 @@ iniconfig==1.1.1
4547
jinja2==2.11.3
4648
# via sphinx
4749
markupsafe==1.1.1
48-
# via jinja2
50+
# via
51+
# jinja2
52+
# sphinx
53+
mypy-extensions==0.4.3
54+
# via mypy
55+
mypy==0.812
56+
# via -r requirements/typing.in
4957
nodeenv==1.6.0
5058
# via pre-commit
5159
packaging==20.9
@@ -54,7 +62,7 @@ packaging==20.9
5462
# pytest
5563
# sphinx
5664
# tox
57-
pallets-sphinx-themes==2.0.0rc1
65+
pallets-sphinx-themes==2.0.0
5866
# via -r requirements/docs.in
5967
pep517==0.10.0
6068
# via pip-tools
@@ -70,13 +78,13 @@ py==1.10.0
7078
# via
7179
# pytest
7280
# tox
73-
pygments==2.8.1
81+
pygments==2.9.0
7482
# via
7583
# sphinx
7684
# sphinx-tabs
7785
pyparsing==2.4.7
7886
# via packaging
79-
pytest==6.2.3
87+
pytest==6.2.4
8088
# via -r requirements/tests.in
8189
python-dotenv==0.17.1
8290
# via -r requirements/tests.in
@@ -86,17 +94,17 @@ pyyaml==5.4.1
8694
# via pre-commit
8795
requests==2.25.1
8896
# via sphinx
89-
six==1.15.0
97+
six==1.16.0
9098
# via
9199
# tox
92100
# virtualenv
93101
snowballstemmer==2.1.0
94102
# via sphinx
95103
sphinx-issues==1.2.0
96104
# via -r requirements/docs.in
97-
sphinx-tabs==2.1.0
105+
sphinx-tabs==3.0.0
98106
# via -r requirements/docs.in
99-
sphinx==3.5.4
107+
sphinx==4.0.1
100108
# via
101109
# -r requirements/docs.in
102110
# pallets-sphinx-themes
@@ -123,11 +131,15 @@ toml==0.10.2
123131
# pre-commit
124132
# pytest
125133
# tox
126-
tox==3.23.0
134+
tox==3.23.1
127135
# via -r requirements/dev.in
136+
typed-ast==1.4.3
137+
# via mypy
138+
typing-extensions==3.10.0.0
139+
# via mypy
128140
urllib3==1.26.4
129141
# via requests
130-
virtualenv==20.4.3
142+
virtualenv==20.4.6
131143
# via
132144
# pre-commit
133145
# tox

‎requirements/docs.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Pallets-Sphinx-Themes >= 2.0.0rc1
1+
Pallets-Sphinx-Themes
22
Sphinx
33
sphinx-issues
44
sphinxcontrib-log-cabinet

‎requirements/docs.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,33 @@
66
#
77
alabaster==0.7.12
88
# via sphinx
9-
babel==2.9.0
9+
babel==2.9.1
1010
# via sphinx
1111
certifi==2020.12.5
1212
# via requests
1313
chardet==4.0.0
1414
# via requests
1515
docutils==0.16
16-
# via sphinx
16+
# via
17+
# sphinx
18+
# sphinx-tabs
1719
idna==2.10
1820
# via requests
1921
imagesize==1.2.0
2022
# via sphinx
2123
jinja2==2.11.3
2224
# via sphinx
2325
markupsafe==1.1.1
24-
# via jinja2
26+
# via
27+
# jinja2
28+
# sphinx
2529
packaging==20.9
2630
# via
2731
# pallets-sphinx-themes
2832
# sphinx
29-
pallets-sphinx-themes==2.0.0rc1
33+
pallets-sphinx-themes==2.0.0
3034
# via -r requirements/docs.in
31-
pygments==2.8.1
35+
pygments==2.9.0
3236
# via
3337
# sphinx
3438
# sphinx-tabs
@@ -42,9 +46,9 @@ snowballstemmer==2.1.0
4246
# via sphinx
4347
sphinx-issues==1.2.0
4448
# via -r requirements/docs.in
45-
sphinx-tabs==2.1.0
49+
sphinx-tabs==3.0.0
4650
# via -r requirements/docs.in
47-
sphinx==3.5.4
51+
sphinx==4.0.1
4852
# via
4953
# -r requirements/docs.in
5054
# pallets-sphinx-themes

‎requirements/tests.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
asgiref==3.3.4
88
# via -r requirements/tests.in
9-
attrs==20.3.0
9+
attrs==21.2.0
1010
# via pytest
1111
blinker==1.4
1212
# via -r requirements/tests.in
13-
greenlet==1.0.0
13+
greenlet==1.1.0
1414
# via -r requirements/tests.in
1515
iniconfig==1.1.1
1616
# via pytest
@@ -22,7 +22,7 @@ py==1.10.0
2222
# via pytest
2323
pyparsing==2.4.7
2424
# via packaging
25-
pytest==6.2.3
25+
pytest==6.2.4
2626
# via -r requirements/tests.in
2727
python-dotenv==0.17.1
2828
# via -r requirements/tests.in

‎requirements/typing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ mypy==0.812
1010
# via -r requirements/typing.in
1111
typed-ast==1.4.3
1212
# via mypy
13-
typing-extensions==3.7.4.3
13+
typing-extensions==3.10.0.0
1414
# via mypy

‎setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
setup(
55
name="Flask",
66
install_requires=[
7-
"Werkzeug>=2.0.0rc4",
8-
"Jinja2>=3.0.0rc1",
9-
"itsdangerous>=2.0.0rc2",
7+
"Werkzeug>=2.0",
8+
"Jinja2>=3.0",
9+
"itsdangerous>=2.0",
1010
"click>=7.1.2",
1111
],
1212
extras_require={ BE6E

‎src/flask/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@
4343
from .templating import render_template
4444
from .templating import render_template_string
4545

46-
__version__ = "2.0.0rc2"
46+
__version__ = "2.0.0"

‎src/flask/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ def create_jinja_environment(self) -> Environment:
704704
session=session,
705705
g=g,
706706
)
707-
rv.policies["json.dumps_function"] = json.dumps # type: ignore
707+
rv.policies["json.dumps_function"] = json.dumps
708708
return rv
709709

710710
def create_global_jinja_loader(self) -> DispatchingJinjaLoader:

0 commit comments

Comments
 (0)
0