Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Upgrade tornado to 6.1 #64304

Merged
merged 34 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
988ea2a
Tornado 6.1
dwoz May 14, 2023
fb0c523
Remove stack_context
dwoz May 14, 2023
5eb2581
web.asynchronous should be replaced by gen.coroutine
dwoz May 14, 2023
27156a2
Get rid of RequestContext
dwoz May 14, 2023
ebd8a6f
New request context
dwoz May 14, 2023
1dcd4ea
Fix docs
dwoz May 14, 2023
05fef9b
Test fix
May 14, 2023
c2d4383
Unit test fixes
May 14, 2023
1874412
Swap for new ioloop for now
May 14, 2023
fbf569a
More test fixes
dwoz May 15, 2023
a3958b6
Add tornado to docs check pre-commit
dwoz May 15, 2023
e0662d2
Saltnado test fixes
dwoz May 16, 2023
d17e461
Remove un-needed file
dwoz May 16, 2023
09e5d0c
Release 3006
dwoz May 16, 2023
191a834
Fix test on windows
dwoz May 16, 2023
0b9f34c
We're still generating 3006 changelogs for some reason
dwoz May 16, 2023
9956c2b
Fix multimaster test
dwoz May 16, 2023
e404f1d
Fix up pre-commit and lint
dwoz May 16, 2023
4298bd8
Deltaproxy test fix
dwoz May 16, 2023
56e69a7
Docstring fixes
dwoz May 16, 2023
f7bd9b9
Work around for amazon linux 2 test dependency failure
dwoz May 16, 2023
5c8f8ec
Remove cruft
dwoz May 17, 2023
9f91102
Fix some windows tests
dwoz May 17, 2023
41e1d04
Add back reporting of failed sub-proxies
dwoz May 17, 2023
99ce874
Fix more deltaproxy tests
dwoz May 18, 2023
7ee831f
Windows fix
dwoz May 18, 2023
94d24b3
Try without the loop policy
dwoz May 18, 2023
d103b46
Remove vendored tornado
dwoz May 17, 2023
cbdb835
Fix cruft caught in review
dwoz May 18, 2023
af63607
Add changelog for tornado upgrade
dwoz May 18, 2023
083b3d9
Do not fail when cleaning up loop file handlers
dwoz May 19, 2023
7fc40b5
Fix up based on PR reviews
dwoz May 19, 2023
8d6ab3e
Revert unwanted changes dependent on other PRs
dwoz May 22, 2023
de122e9
The linter is not always right
dwoz May 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,7 @@ repos:
alias: rewrite-tests
name: Rewrite Salt's Test Suite
files: ^tests/.*\.py$
args: [--silent, -E, fix_asserts, -E, fix_docstrings]
args: [--silent, -E, fix_asserts, -E, fix_docstrings, -E, fix_tornado_imports]

- repo: https://github.com/timothycrosley/isort
rev: 5.12.0
Expand Down Expand Up @@ -1320,6 +1320,7 @@ repos:
- msgpack==1.0.3
- packaging
- looseversion
- tornado

- repo: https://github.com/saltstack/invoke-pre-commit
rev: v1.9.0
Expand All @@ -1339,6 +1340,7 @@ repos:
- msgpack==1.0.3
- packaging
- looseversion
- tornado

- repo: https://github.com/saltstack/invoke-pre-commit
rev: v1.9.0
Expand All @@ -1362,6 +1364,7 @@ repos:
- msgpack==1.0.3
- packaging
- looseversion
- tornado

- repo: https://github.com/saltstack/invoke-pre-commit
rev: v1.9.0
Expand All @@ -1385,6 +1388,7 @@ repos:
- msgpack==1.0.3
- packaging
- looseversion
- tornado

- repo: https://github.com/saltstack/invoke-pre-commit
rev: v1.9.0
Expand Down
1 change: 1 addition & 0 deletions changelog/64305.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgade to a recent tornado version 6.1
1 change: 1 addition & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ packaging>=21.3
looseversion
# We need contextvars for salt-ssh
contextvars
tornado>=6.1
1 change: 1 addition & 0 deletions requirements/static/ci/docs.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
--constraint=./py{py_version}/{platform}.txt


sphinx>=3.5.1; python_version < '3.9'
sphinx>=6.1.0; python_version >= '3.9'
myst-docutils[linkify]
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.10/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.9
# via junos-eznc
typing-extensions==4.2.0
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.10/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.1
# via junos-eznc
typing-extensions==4.2.0
Expand Down
4 changes: 4 additions & 0 deletions requirements/static/ci/py3.10/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ tempora==4.1.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# portend
tornado==6.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
typing-extensions==4.2.0
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.10/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.1
# via junos-eznc
typing-extensions==4.2.0
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.10/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,9 @@ toml==0.10.2
# -r requirements/static/ci/common.in
# -r requirements/static/ci/lint.in
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.8
# via junos-eznc
twilio==7.9.2
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.10/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,9 @@ toml==0.10.2
tomli==2.0.1
# via pytest
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.1
# via junos-eznc
twilio==7.9.2
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.10/pkgtests-windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ tempora==5.2.1
# via portend
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.4.0
# via
# pydantic
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.10/pkgtests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ tempora==5.2.0
# via portend
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.4.0
# via
# pydantic
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.10/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.4.0
# via
# pytest-shell-utilities
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.11/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,8 @@ timelib==0.2.5
# via -r requirements/darwin.txt
toml==0.10.2
# via -r requirements/static/ci/common.in
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.2.0
# via
# pytest-shell-utilities
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.11/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,8 @@ timelib==0.2.5
# via -r requirements/static/pkg/freebsd.in
toml==0.10.2
# via -r requirements/static/ci/common.in
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.2.0
# via
# pytest-shell-utilities
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.11/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,9 @@ timelib==0.2.5
toml==0.10.2
# via -r requirements/static/ci/common.in
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typing-extensions==4.2.0
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.11/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ timelib==0.2.5
# via -r requirements/windows.txt
toml==0.10.2
# via -r requirements/static/ci/common.in
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.4.0
# via
# pytest-shell-utilities
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.7/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.9
# via junos-eznc
typing-extensions==3.10.0.0
Expand Down
4 changes: 4 additions & 0 deletions requirements/static/ci/py3.7/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ tempora==4.1.1
# via
# -c requirements/static/ci/py3.7/linux.txt
# portend
tornado==6.1.0
# via
# -c requirements/static/ci/py3.7/linux.txt
# -r requirements/base.txt
typing-extensions==3.10.0.0
# via
# -c requirements/static/ci/py3.7/linux.txt
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.7/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.1
# via junos-eznc
typing-extensions==3.10.0.0
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.7/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,9 @@ toml==0.10.2
# -r requirements/static/ci/common.in
# -r requirements/static/ci/lint.in
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.8
# via junos-eznc
twilio==7.9.2
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.7/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,9 @@ toml==0.10.2
tomli==2.0.1
# via pytest
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.1
# via junos-eznc
twilio==7.9.2
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.7/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.2.0
# via
# aiohttp
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.8/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.9
# via junos-eznc
typing-extensions==3.10.0.2
Expand Down
4 changes: 4 additions & 0 deletions requirements/static/ci/py3.8/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ tempora==4.1.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# portend
tornado==6.1.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
typing-extensions==4.2.0
# via
# -c requirements/static/ci/py3.8/linux.txt
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.8/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.1
# via junos-eznc
typing-extensions==4.2.0
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.8/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,9 @@ toml==0.10.2
# -r requirements/static/ci/common.in
# -r requirements/static/ci/lint.in
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.8
# via junos-eznc
twilio==7.9.2
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.8/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,9 @@ toml==0.10.2
tomli==2.0.1
# via pytest
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.1
# via junos-eznc
twilio==7.9.2
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.8/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.2.0
# via
# pytest-shell-utilities
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.9/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.9
# via junos-eznc
typing-extensions==3.10.0.2
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.9/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.1
# via junos-eznc
typing-extensions==4.2.0
Expand Down
4 changes: 4 additions & 0 deletions requirements/static/ci/py3.9/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ tempora==4.1.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# portend
tornado==6.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
typing-extensions==4.2.0
# via
# -c requirements/static/ci/py3.9/linux.txt
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.9/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
transitions==0.8.1
# via junos-eznc
typing-extensions==4.2.0
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.9/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,9 @@ toml==0.10.2
# -r requirements/static/ci/common.in
# -r requirements/static/ci/lint.in
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.8
# via junos-eznc
twilio==7.9.2
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.9/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,9 @@ toml==0.10.2
tomli==2.0.1
# via pytest
tornado==6.1
# via python-telegram-bot
# via
# -r requirements/base.txt
# python-telegram-bot
transitions==0.8.1
# via junos-eznc
twilio==7.9.2
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/ci/py3.9/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ toml==0.10.2
# via -r requirements/static/ci/common.in
tomli==2.0.1
# via pytest
tornado==6.1.0
# via -r requirements/base.txt
typing-extensions==4.2.0
# via
# pytest-shell-utilities
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.10/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ tempora==4.1.1
# via portend
timelib==0.2.5
# via -r requirements/darwin.txt
tornado==6.1.0
# via -r requirements/base.txt
urllib3==1.26.6
# via requests
vultr==1.0.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/static/pkg/py3.10/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ tempora==4.1.1
# via portend
timelib==0.2.5
# via -r requirements/static/pkg/freebsd.in
tornado==6.1.0
# via -r requirements/base.txt
urllib3==1.26.6
# via requests
zc.lockfile==1.4
Expand Down
Loading