From 79f240c2e974f72f9420b512ba7a5cad65601109 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 13 May 2023 21:28:32 -0700 Subject: [PATCH] Tornado 6.1 --- requirements/base.txt | 1 + requirements/static/ci/py3.10/darwin.txt | 2 ++ requirements/static/ci/py3.10/freebsd.txt | 2 ++ requirements/static/ci/py3.10/linux.txt | 4 +++- 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/linux.txt | 4 +++- requirements/static/ci/py3.11/windows.txt | 2 ++ requirements/static/ci/py3.7/cloud.txt | 2 ++ requirements/static/ci/py3.7/freebsd.txt | 2 ++ requirements/static/ci/py3.7/linux.txt | 4 +++- requirements/static/ci/py3.7/windows.txt | 2 ++ requirements/static/ci/py3.8/freebsd.txt | 2 ++ requirements/static/ci/py3.8/linux.txt | 4 +++- requirements/static/ci/py3.8/windows.txt | 2 ++ requirements/static/ci/py3.9/darwin.txt | 2 ++ requirements/static/ci/py3.9/freebsd.txt | 2 ++ requirements/static/ci/py3.9/linux.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 | 2 ++ 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/__init__.py | 2 +- 39 files changed, 81 insertions(+), 6 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c19d8804a2b..5cbe319033e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,3 +10,4 @@ packaging>=21.3 looseversion # We need contextvars for salt-ssh contextvars +tornado==6.1 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index d6789f835f7..28bf0ca747b 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -832,6 +832,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc typing-extensions==4.2.0 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index f7c63cdfa59..0f219528a08 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -832,6 +832,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc typing-extensions==4.2.0 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 271c1edd344..64534cfd48a 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 3f1db8377e8..1dcd739c619 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -381,6 +381,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt typing-extensions==4.4.0 # via # pytest-shell-utilities diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index d9c608388db..5b0e6653f3d 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -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 + # via -r requirements/base.txt typing-extensions==4.2.0 # via # pytest-shell-utilities diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 0e45bcde4ad..eabe2ed71bb 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -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 + # via -r requirements/base.txt typing-extensions==4.2.0 # via # pytest-shell-utilities diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 2639d371cc4..65cf9f900cb 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 6c9a0d5e5b7..4499d2a06ec 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -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 + # via -r requirements/base.txt typing-extensions==4.4.0 # via # pytest-shell-utilities diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 857a9d054bc..bdf1ad39fd8 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -906,6 +906,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt transitions==0.8.9 # via junos-eznc typing-extensions==3.10.0.0 diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 71f214e61b6..05c49e43d4c 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -883,6 +883,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc typing-extensions==3.10.0.0 diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 9c7a7c86dc3..42a5aecd817 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index b43b83d8678..a78774de098 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -396,6 +396,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt typing-extensions==4.2.0 # via # aiohttp diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 213c64652d4..f7d3611c958 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -873,6 +873,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc typing-extensions==4.2.0 diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index e7fd9969871..06db49b21e2 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 4dca1d45370..2831f738e03 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -384,6 +384,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt typing-extensions==4.2.0 # via # pytest-shell-utilities diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 8be41123871..c2fa345295c 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -876,6 +876,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc typing-extensions==4.2.0 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 59fa8c6b367..cb3a13c8c03 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -876,6 +876,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt transitions==0.8.1 # via junos-eznc typing-extensions==4.2.0 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 0821935f033..3c96e9bfa77 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index e70f94b0c9b..6174333379a 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -385,6 +385,8 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest +tornado==6.1 + # via -r requirements/base.txt typing-extensions==4.2.0 # via # pytest-shell-utilities diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index eafb49833a4..2e61015f31b 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -110,6 +110,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests vultr==1.0.1 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 29f788900b8..dfc5f15fca5 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -94,6 +94,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 97a261d561d..4c9e6627e21 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -96,6 +96,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 6c8a45998a3..93ce68ef11e 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -124,6 +124,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via # -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 0bbc204c682..697fe56dded 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -110,6 +110,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests vultr==1.0.1 diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index a774d5094df..0e063bf599a 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -94,6 +94,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index f48281b557d..92bac4cd567 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -96,6 +96,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index b6a308084a4..261994de053 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -124,6 +124,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via # -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index 26e8770955e..357698b2b60 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -92,6 +92,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in +tornado==6.1 + # via -r requirements/base.txt typing-extensions==3.10.0.0 # via importlib-metadata urllib3==1.26.6 diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 43a28df0d00..2eac8ab3d43 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -94,6 +94,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in +tornado==6.1 + # via -r requirements/base.txt typing-extensions==3.10.0.0 # via importlib-metadata urllib3==1.26.6 diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index 21965d5b388..d23f409be61 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -125,6 +125,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt +tornado==6.1 + # via -r requirements/base.txt typing-extensions==4.4.0 # via # gitpython diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index 7abd3ba5be0..b955f4c5608 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -92,6 +92,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index e48795ddd56..edc86f2abba 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -94,6 +94,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 33734387c70..03df1407e8e 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -125,6 +125,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via # -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 978ce51a1d3..c9395f2635b 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -110,6 +110,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests vultr==1.0.1 diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index e52705fe720..abf04e7fa91 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -94,6 +94,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 4277f66da62..14f6f384a8c 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -96,6 +96,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via requests zc.lockfile==1.4 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index cb76bdf0b3d..d20b63b5708 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -125,6 +125,8 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt +tornado==6.1 + # via -r requirements/base.txt urllib3==1.26.6 # via # -r requirements/windows.txt diff --git a/salt/__init__.py b/salt/__init__.py index 6649fdf5683..49fea82bb42 100644 --- a/salt/__init__.py +++ b/salt/__init__.py @@ -12,7 +12,7 @@ if sys.version_info < (3,): ) sys.stderr.flush() -USE_VENDORED_TORNADO = True +USE_VENDORED_TORNADO = False class TornadoImporter: