From 166c07f6dad47978962c0d100674da354a1d6359 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 13 May 2023 22:22:34 -0700 Subject: [PATCH] Get rid of RequestContext --- requirements/base.txt | 2 +- requirements/static/ci/docs.in | 1 + requirements/static/ci/py3.10/cloud.txt | 2 + requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/docs.txt | 4 + requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/lint.txt | 4 +- .../static/ci/py3.10/pkgtests-windows.txt | 2 + requirements/static/ci/py3.10/pkgtests.txt | 2 + requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.11/darwin.txt | 2 +- requirements/static/ci/py3.11/freebsd.txt | 2 +- requirements/static/ci/py3.11/windows.txt | 2 +- requirements/static/ci/py3.7/cloud.txt | 2 +- requirements/static/ci/py3.7/docs.txt | 4 + requirements/static/ci/py3.7/freebsd.txt | 2 +- requirements/static/ci/py3.7/lint.txt | 4 +- requirements/static/ci/py3.7/windows.txt | 2 +- requirements/static/ci/py3.8/cloud.txt | 2 + requirements/static/ci/py3.8/docs.txt | 4 + requirements/static/ci/py3.8/freebsd.txt | 2 +- requirements/static/ci/py3.8/lint.txt | 4 +- requirements/static/ci/py3.8/windows.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 + requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/docs.txt | 4 + requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/lint.txt | 4 +- requirements/static/ci/py3.9/windows.txt | 2 +- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 81 ++++++++++--------- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.11/darwin.txt | 2 +- requirements/static/pkg/py3.11/freebsd.txt | 2 +- requirements/static/pkg/py3.11/linux.txt | 2 +- requirements/static/pkg/py3.11/windows.txt | 2 +- requirements/static/pkg/py3.7/freebsd.txt | 2 +- requirements/static/pkg/py3.7/linux.txt | 2 +- requirements/static/pkg/py3.7/windows.txt | 2 +- requirements/static/pkg/py3.8/freebsd.txt | 2 +- requirements/static/pkg/py3.8/linux.txt | 2 +- requirements/static/pkg/py3.8/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- salt/_logging/impl.py | 8 +- salt/master.py | 2 - salt/minion.py | 8 +- 50 files changed, 124 insertions(+), 82 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 5cbe319033e..f56998a7a7f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,4 +10,4 @@ packaging>=21.3 looseversion # We need contextvars for salt-ssh contextvars -tornado==6.1 +tornado>=6.1 diff --git a/requirements/static/ci/docs.in b/requirements/static/ci/docs.in index 379223dfb95..f2c9f013b7e 100644 --- a/requirements/static/ci/docs.in +++ b/requirements/static/ci/docs.in @@ -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] diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 4efb5c1129b..705c2f9bd3e 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 28bf0ca747b..14176d821a1 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -832,7 +832,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index d5432bfb013..3d955fbcf70 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 0f219528a08..777cc246220 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -832,7 +832,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 5ca4fd978cb..0fe90217d18 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.10/pkgtests-windows.txt b/requirements/static/ci/py3.10/pkgtests-windows.txt index 2ba612f0a16..4b4797d9c68 100644 --- a/requirements/static/ci/py3.10/pkgtests-windows.txt +++ b/requirements/static/ci/py3.10/pkgtests-windows.txt @@ -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 diff --git a/requirements/static/ci/py3.10/pkgtests.txt b/requirements/static/ci/py3.10/pkgtests.txt index e5f6a8d0499..679c1aa2c76 100644 --- a/requirements/static/ci/py3.10/pkgtests.txt +++ b/requirements/static/ci/py3.10/pkgtests.txt @@ -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 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 1dcd739c619..c6cb3771fa9 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -381,7 +381,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.4.0 # via diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 5b0e6653f3d..7a4c059f660 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -794,7 +794,7 @@ timelib==0.2.5 # via -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.2.0 # via diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index eabe2ed71bb..ca4b7803414 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -802,7 +802,7 @@ 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 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.2.0 # via diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 4499d2a06ec..f731b5934e0 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -377,7 +377,7 @@ timelib==0.2.5 # via -r requirements/windows.txt toml==0.10.2 # via -r requirements/static/ci/common.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.4.0 # via diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index bdf1ad39fd8..32561f5fc98 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -906,7 +906,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt transitions==0.8.9 # via junos-eznc diff --git a/requirements/static/ci/py3.7/docs.txt b/requirements/static/ci/py3.7/docs.txt index 7876517ba0e..4e2b3faa8e3 100644 --- a/requirements/static/ci/py3.7/docs.txt +++ b/requirements/static/ci/py3.7/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 05c49e43d4c..55f03c45788 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -883,7 +883,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index f9dba2dd5ec..28dcdd07a32 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index a78774de098..ef53e435808 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -396,7 +396,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.2.0 # via diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 9fa61127c8f..8e4137889d6 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index bd6095559a2..7117ac0cc9b 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index f7d3611c958..b342c54f3da 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -873,7 +873,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index 27832bd6b76..bf84e81e184 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 2831f738e03..25e4ce3c70c 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -384,7 +384,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.2.0 # via diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index fc91bb9d9ad..23caf2ebf87 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index c2fa345295c..9075f7fc733 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -876,7 +876,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 3067f1725f7..8d0636aafdb 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index cb3a13c8c03..108e161f109 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -876,7 +876,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 51cf5153aed..787cead5000 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 6174333379a..3e29250743d 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -385,7 +385,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.2.0 # via diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 2e61015f31b..8226cfee877 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -110,7 +110,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index dfc5f15fca5..857f79b4137 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -94,7 +94,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 4c9e6627e21..c11b41ad512 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -4,84 +4,90 @@ # # pip-compile --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # -certifi==2022.12.7 +autocommand==2.2.2 + # via jaraco.text +certifi==2023.5.7 # via requests -cffi==1.14.6 +cffi==1.15.1 # via cryptography -chardet==3.0.4 +charset-normalizer==3.1.0 # via requests -cheroot==8.5.2 +cheroot==9.0.0 # via cherrypy -cherrypy==18.6.1 +cherrypy==18.8.0 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt -cryptography==39.0.2 +cryptography==40.0.2 # via # -r requirements/static/pkg/linux.in # pyopenssl -distro==1.5.0 +distro==1.8.0 # via -r requirements/base.txt -idna==2.8 +idna==3.4 # via requests -immutables==0.15 +immutables==0.19 # via contextvars -importlib-metadata==6.0.0 +importlib-metadata==6.6.0 # via -r requirements/static/pkg/linux.in -jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 +inflect==6.0.4 + # via jaraco.text +jaraco.collections==4.1.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==4.3.0 + # via jaraco.text +jaraco.functools==3.6.0 # via # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==3.11.1 # via jaraco.collections jinja2==3.1.2 # via -r requirements/base.txt jmespath==1.0.1 # via -r requirements/base.txt -looseversion==1.0.2 +looseversion==1.1.2 # via -r requirements/base.txt markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==5.0.0 +more-itertools==9.1.0 # via # cheroot # cherrypy - # jaraco.classes # jaraco.functools -msgpack==1.0.2 + # jaraco.text +msgpack==1.0.5 # via -r requirements/base.txt -packaging==22.0 +packaging==23.1 # via -r requirements/base.txt -portend==2.4 +portend==3.1.0 # via cherrypy -psutil==5.8.0 +psutil==5.9.5 # via -r requirements/base.txt pycparser==2.21 ; python_version >= "3.9" # via # -r requirements/static/pkg/linux.in # cffi -pycryptodomex==3.9.8 +pycryptodomex==3.17 # via -r requirements/crypto.txt -pyopenssl==23.0.0 +pydantic==1.10.7 + # via inflect +pyopenssl==23.1.1 # via -r requirements/static/pkg/linux.in -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via -r requirements/static/pkg/linux.in -python-gnupg==0.4.8 +python-gnupg==0.5.0 # via -r requirements/static/pkg/linux.in -pytz==2022.1 +pytz==2023.3 # via tempora -pyyaml==5.4.1 +pyyaml==6.0 # via -r requirements/base.txt -pyzmq==23.2.0 ; python_version < "3.11" +pyzmq==25.0.2 ; python_version < "3.11" # via -r requirements/zeromq.txt -requests==2.25.1 +requests==2.30.0 # via -r requirements/base.txt rpm-vercmp==0.1.2 # via -r requirements/static/pkg/linux.in @@ -90,19 +96,20 @@ setproctitle==1.3.2 six==1.16.0 # via # cheroot - # more-itertools # python-dateutil -tempora==4.1.1 +tempora==5.2.2 # via portend -timelib==0.2.5 +timelib==0.3.0 # via -r requirements/static/pkg/linux.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt -urllib3==1.26.6 +typing-extensions==4.5.0 + # via pydantic +urllib3==2.0.2 # via requests -zc.lockfile==1.4 +zc.lockfile==3.0.post1 # via cherrypy -zipp==3.6.0 +zipp==3.15.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 93ce68ef11e..7177dd4b114 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -124,7 +124,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 697fe56dded..8bdc136484c 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -110,7 +110,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index 0e063bf599a..88df25bdbe4 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -94,7 +94,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 92bac4cd567..59e4d28a574 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -96,7 +96,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 261994de053..8abb7a87f14 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -124,7 +124,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index 357698b2b60..80ab3785df0 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -92,7 +92,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==3.10.0.0 # via importlib-metadata diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 2eac8ab3d43..dc294914ad0 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -94,7 +94,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==3.10.0.0 # via importlib-metadata diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index d23f409be61..4c0b3038378 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -125,7 +125,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt typing-extensions==4.4.0 # via diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index b955f4c5608..1ff0c47d970 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -92,7 +92,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index edc86f2abba..4a7a1e20dfe 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -94,7 +94,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 03df1407e8e..3e4a67eaecf 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -125,7 +125,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index c9395f2635b..ae6e66a71dd 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -110,7 +110,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index abf04e7fa91..497354a6e09 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -94,7 +94,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 14f6f384a8c..4b72f0b27d5 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -96,7 +96,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via requests diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index d20b63b5708..d22409f1fea 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -125,7 +125,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -tornado==6.1 +tornado==6.1.0 # via -r requirements/base.txt urllib3==1.26.6 # via diff --git a/salt/_logging/impl.py b/salt/_logging/impl.py index cc18f49a9e9..3656d832048 100644 --- a/salt/_logging/impl.py +++ b/salt/_logging/impl.py @@ -32,7 +32,6 @@ from salt._logging.handlers import SysLogHandler # isort:skip from salt._logging.handlers import WatchedFileHandler # isort:skip from salt._logging.mixins import LoggingMixinMeta # isort:skip from salt.exceptions import LoggingRuntimeError # isort:skip -from salt.utils.ctx import RequestContext # isort:skip from salt.utils.immutabletypes import freeze, ImmutableDict # isort:skip from salt.utils.textformat import TextFormat # isort:skip @@ -238,8 +237,11 @@ class SaltLoggingClass(LOGGING_LOGGER_CLASS, metaclass=LoggingMixinMeta): extra = {} # pylint: disable=no-member - current_jid = RequestContext.current.get("data", {}).get("jid", None) - log_fmt_jid = RequestContext.current.get("opts", {}).get("log_fmt_jid", None) + # XXX TODO + # current_jid = RequestContext.current.get("data", {}).get("jid", None) + # log_fmt_jid = RequestContext.current.get("opts", {}).get("log_fmt_jid", None) + current_jid = "" + log_fmt_jid = "" # pylint: enable=no-member if current_jid is not None: diff --git a/salt/master.py b/salt/master.py index 6cb5dd178a9..b1b7a1b0daa 100644 --- a/salt/master.py +++ b/salt/master.py @@ -5,7 +5,6 @@ involves preparing the three listeners and the workers needed by the master. import collections import copy import ctypes -import functools import logging import multiprocessing import os @@ -58,7 +57,6 @@ from salt.config import DEFAULT_INTERVAL from salt.defaults import DEFAULT_TARGET_DELIM from salt.transport import TRANSPORTS from salt.utils.channel import iter_transport_opts -from salt.utils.ctx import RequestContext from salt.utils.debug import ( enable_sigusr1_handler, enable_sigusr2_handler, diff --git a/salt/minion.py b/salt/minion.py index 10b75fc2bfc..1fddc06f5eb 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -4,7 +4,6 @@ Routines to set up a minion import binascii import contextlib import copy -import functools import logging import multiprocessing import os @@ -70,7 +69,6 @@ from salt.exceptions import ( SaltSystemExit, ) from salt.template import SLS_ENCODING -from salt.utils.ctx import RequestContext from salt.utils.debug import enable_sigusr1_handler from salt.utils.event import tagify from salt.utils.network import parse_host_port @@ -2250,7 +2248,8 @@ class Minion(MinionBase): else: # pylint: disable=unexpected-keyword-arg ret_val = self._send_req_async( - load, timeout=timeout, callback=lambda f: None + load, + timeout=timeout, ) # pylint: enable=unexpected-keyword-arg @@ -2340,7 +2339,8 @@ class Minion(MinionBase): else: # pylint: disable=unexpected-keyword-arg ret_val = self._send_req_async( - load, timeout=timeout, callback=lambda f: None + load, + timeout=timeout, ) # pylint: enable=unexpected-keyword-arg