Skip to content

Commit d195fed

Browse files
authored
fix(flask): remove deprecated hooks in flask 2.3.0 [backport #5663 to 1.12] (#5696)
Backport of #5663 to 1.12 Fixes Flask patching errors for the Flask release 2.3.0, and adjusts the CI pipeline: - Deprecated hooks `Flask.before_first_request` and `Blueprint.before_app_first_request` - Dropped support for Python 3.7 Fixes #5671 ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/contributing.html#Release-Note-Guidelines) are followed. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] PR description includes explicit acknowledgement/acceptance of the performance implications of this PR as reported in the benchmarks PR comment. ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment.
1 parent 2bf2de0 commit d195fed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+916
-225
lines changed
Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.7
2+
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/2a3d7ea.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/110a49d.in
66
#
7-
attrs==22.2.0
8-
blinker==1.5
7+
attrs==23.1.0
8+
blinker==1.6.2
99
certifi==2022.12.7
1010
charset-normalizer==3.1.0
1111
click==8.1.3
12-
coverage[toml]==7.2.2
12+
coverage[toml]==7.2.3
1313
exceptiongroup==1.1.1
14-
flask==2.2.3
14+
flask==2.0.3
1515
hypothesis==6.45.0
1616
idna==3.4
1717
importlib-metadata==6.0.0
1818
iniconfig==2.0.0
1919
itsdangerous==2.1.2
2020
jinja2==3.1.2
2121
markupsafe==2.1.2
22-
mock==5.0.1
22+
mock==5.0.2
2323
opentracing==2.4.0
24-
packaging==23.0
24+
packaging==23.1
2525
pluggy==1.0.0
26-
pytest==7.2.2
26+
pytest==7.3.1
2727
pytest-cov==4.0.0
2828
pytest-mock==3.10.0
29-
requests==2.28.2
29+
requests==2.29.0
3030
sortedcontainers==2.4.0
3131
tomli==2.0.1
32-
typing-extensions==4.5.0
3332
urllib3==1.26.15
34-
werkzeug==2.2.3
33+
werkzeug==2.3.0
3534
zipp==3.15.0

.riot/requirements/1119833.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1119833.in
6+
#
7+
attrs==23.1.0
8+
blinker==1.6.2
9+
certifi==2022.12.7
10+
charset-normalizer==3.1.0
11+
click==8.1.3
12+
coverage[toml]==7.2.3
13+
exceptiongroup==1.1.1
14+
flask==2.3.1
15+
hypothesis==6.45.0
16+
idna==3.4
17+
importlib-metadata==6.0.0
18+
iniconfig==2.0.0
19+
itsdangerous==2.1.2
20+
jinja2==3.1.2
21+
markupsafe==2.1.2
22+
mock==5.0.2
23+
opentracing==2.4.0
24+
packaging==23.1
25+
pluggy==1.0.0
26+
pytest==7.3.1
27+
pytest-cov==4.0.0
28+
pytest-mock==3.10.0
29+
requests==2.29.0
30+
sortedcontainers==2.4.0
31+
tomli==2.0.1
32+
urllib3==1.26.15
33+
werkzeug==2.3.0
34+
zipp==3.15.0

.riot/requirements/114a87c.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/114a87c.in
6+
#
7+
attrs==23.1.0
8+
blinker==1.6.2
9+
certifi==2022.12.7
10+
charset-normalizer==3.1.0
11+
click==8.1.3
12+
coverage[toml]==7.2.3
13+
exceptiongroup==1.1.1
14+
flask==2.3.1
15+
hypothesis==6.45.0
16+
idna==3.4
17+
importlib-metadata==6.0.0
18+
iniconfig==2.0.0
19+
itsdangerous==2.1.2
20+
jinja2==3.1.2
21+
markupsafe==2.1.2
22+
mock==5.0.2
23+
opentracing==2.4.0
24+
packaging==23.1
25+
pluggy==1.0.0
26+
pytest==7.3.1
27+
pytest-cov==4.0.0
28+
pytest-mock==3.10.0
29+
requests==2.29.0
30+
sortedcontainers==2.4.0
31+
tomli==2.0.1
32+
urllib3==1.26.15
33+
werkzeug==2.3.0
34+
zipp==3.15.0

.riot/requirements/117247d.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/117247d.in
6+
#
7+
attrs==23.1.0
8+
blinker==1.6.2
9+
certifi==2022.12.7
10+
charset-normalizer==3.1.0
11+
click==8.1.3
12+
coverage[toml]==7.2.3
13+
exceptiongroup==1.1.1
14+
flask==2.0.3
15+
hypothesis==6.45.0
16+
idna==3.4
17+
importlib-metadata==6.0.0
18+
iniconfig==2.0.0
19+
itsdangerous==2.1.2
20+
jinja2==3.1.2
21+
markupsafe==2.1.2
22+
mock==5.0.2
23+
opentracing==2.4.0
24+
packaging==23.1
25+
pluggy==1.0.0
26+
pytest==7.3.1
27+
pytest-cov==4.0.0
28+
pytest-mock==3.10.0
29+
requests==2.29.0
30+
sortedcontainers==2.4.0
31+
tomli==2.0.1
32+
urllib3==1.26.15
33+
werkzeug==2.3.0
34+
zipp==3.15.0

.riot/requirements/1646549.txt renamed to .riot/requirements/124f693.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --no-annotate .riot/requirements/1646549.in
5+
# pip-compile --no-annotate .riot/requirements/124f693.in
66
#
77
atomicwrites==1.4.1
88
attrs==21.4.0
@@ -24,9 +24,11 @@ markupsafe==1.1.1
2424
mock==3.0.5
2525
more-itertools==5.0.0
2626
opentracing==2.4.0
27+
packaging==20.9
2728
pathlib2==2.3.7.post1
2829
pluggy==0.13.1
2930
py==1.11.0
31+
pyparsing==2.4.7
3032
pytest-cov==2.1.0
3133
pytest-mock==2.0.0
3234
pytest==3.10.1

.riot/requirements/13a213a.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/13a213a.in
6+
#
7+
attrs==23.1.0
8+
blinker==1.6.2
9+
certifi==2022.12.7
10+
charset-normalizer==3.1.0
11+
click==8.1.3
12+
coverage[toml]==7.2.3
13+
exceptiongroup==1.1.1
14+
flask==2.3.1
15+
hypothesis==6.45.0
16+
idna==3.4
17+
importlib-metadata==6.0.0
18+
iniconfig==2.0.0
19+
itsdangerous==2.1.2
20+
jinja2==3.1.2
21+
markupsafe==2.1.2
22+
mock==5.0.2
23+
opentracing==2.4.0
24+
packaging==23.1
25+
pluggy==1.0.0
26+
pytest==7.3.1
27+
pytest-cov==4.0.0
28+
pytest-mock==3.10.0
29+
requests==2.29.0
30+
sortedcontainers==2.4.0
31+
tomli==2.0.1
32+
urllib3==1.26.15
33+
werkzeug==2.3.0
34+
zipp==3.15.0

.riot/requirements/8f570cd.txt renamed to .riot/requirements/141a618.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/8f570cd.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/141a618.in
66
#
77
atomicwrites==1.4.1
8-
attrs==22.2.0
9-
blinker==1.5
8+
attrs==23.1.0
9+
blinker==1.6.2
1010
click==8.1.3
11-
coverage==7.2.2
11+
coverage==7.2.3
1212
flask==0.12.5
1313
flask-cache==0.13.1
1414
hypothesis==6.45.0
1515
itsdangerous==1.1.0
1616
jinja2==2.11.3
1717
markupsafe==1.1.1
18-
mock==5.0.1
18+
mock==5.0.2
1919
more-itertools==8.10.0
2020
opentracing==2.4.0
21+
packaging==23.1
2122
pluggy==1.0.0
2223
py==1.11.0
2324
pytest==3.10.1

.riot/requirements/1474435.txt renamed to .riot/requirements/142fe39.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1474435.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/142fe39.in
66
#
7-
attrs==22.2.0
8-
blinker==1.5
7+
attrs==23.1.0
8+
blinker==1.6.2
99
cachelib==0.9.0
1010
click==8.1.3
11-
coverage[toml]==7.2.2
11+
coverage[toml]==7.2.3
1212
exceptiongroup==1.1.1
13-
flask==2.2.3
13+
flask==2.3.1
1414
flask-caching==2.0.2
1515
hypothesis==6.45.0
16-
importlib-metadata==6.0.0
16+
importlib-metadata==6.6.0
1717
iniconfig==2.0.0
1818
itsdangerous==2.1.2
1919
jinja2==3.1.2
2020
markupsafe==2.1.2
21-
mock==5.0.1
21+
mock==5.0.2
2222
opentracing==2.4.0
23-
packaging==23.0
23+
packaging==23.1
2424
pluggy==1.0.0
25-
pytest==7.2.2
25+
pytest==7.3.1
2626
pytest-cov==4.0.0
2727
pytest-mock==3.10.0
2828
python-memcached==1.59
2929
redis==2.10.6
3030
six==1.16.0
3131
sortedcontainers==2.4.0
3232
tomli==2.0.1
33-
werkzeug==2.2.3
33+
werkzeug==2.3.0
3434
zipp==3.15.0

.riot/requirements/155a4f0.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/155a4f0.in
6+
#
7+
attrs==23.1.0
8+
blinker==1.6.2
9+
certifi==2022.12.7
10+
charset-normalizer==3.1.0
11+
click==8.1.3
12+
coverage[toml]==7.2.3
13+
exceptiongroup==1.1.1
14+
flask==2.3.1
15+
hypothesis==6.45.0
16+
idna==3.4
17+
importlib-metadata==6.0.0
18+
iniconfig==2.0.0
19+
itsdangerous==2.1.2
20+
jinja2==3.1.2
21+
markupsafe==2.1.2
22+
mock==5.0.2
23+
opentracing==2.4.0
24+
packaging==23.1
25+
pluggy==1.0.0
26+
pytest==7.3.1
27+
pytest-cov==4.0.0
28+
pytest-mock==3.10.0
29+
requests==2.29.0
30+
sortedcontainers==2.4.0
31+
tomli==2.0.1
32+
urllib3==1.26.15
33+
werkzeug==2.3.0
34+
zipp==3.15.0

.riot/requirements/1aa3a83.txt renamed to .riot/requirements/155fc8a.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1aa3a83.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/155fc8a.in
66
#
7-
attrs==22.2.0
8-
blinker==1.5
7+
attrs==23.1.0
8+
blinker==1.6.2
99
cachelib==0.9.0
1010
click==8.1.3
11-
coverage[toml]==7.2.2
12-
flask==2.2.3
11+
coverage[toml]==7.2.3
12+
flask==2.3.1
1313
flask-caching==2.0.2
1414
hypothesis==6.45.0
1515
iniconfig==2.0.0
1616
itsdangerous==2.1.2
1717
jinja2==3.1.2
1818
markupsafe==2.1.2
19-
mock==5.0.1
19+
mock==5.0.2
2020
opentracing==2.4.0
21-
packaging==23.0
21+
packaging==23.1
2222
pluggy==1.0.0
23-
pytest==7.2.2
23+
pytest==7.3.1
2424
pytest-cov==4.0.0
2525
pytest-mock==3.10.0
2626
python-memcached==1.59
2727
redis==2.10.6
2828
six==1.16.0
2929
sortedcontainers==2.4.0
30-
werkzeug==2.2.3
30+
werkzeug==2.3.0

0 commit comments

Comments
 (0)