Update requirements for tornado changes

requirements/base.txt

@@ -5,8 +5,3 @@ msgpack>=0.5,!=0.5.5
 PyYAML
 MarkupSafe
 requests>=1.0.0
-tornado>=4.2.1,<6.0; python_version < '3'
-tornado>=4.2.1,<5.0; python_version >= '3.4'
-
-# Required by Tornado to handle threads stuff.
-futures>=2.0; python_version < '3.0'

requirements/static/darwin.in

@@ -35,3 +35,9 @@ Genshi
 Cheetah3==3.1.0
 Mako
 wempy; python_version <'3'
+
+# Requirements for Tornado 4.5.3 (vendored as salt.ext.tornado)
+backports-abc==0.5
+singledispatch==3.4.0.3
+# Required by Tornado to handle threads stuff.
+futures>=2.0; python_version < '3.0'

requirements/static/linux.in

@@ -40,7 +40,6 @@ setuptools-scm
 strict_rfc3339
 supervisor==3.3.5; python_version < '3'
 timelib
-tornado<5.0
 virtualenv
 watchdog
 vcert~=0.7.0
@@ -50,3 +49,9 @@ Genshi
 Cheetah3==3.1.0
 Mako
 wempy; python_version <'3'
+
+# Requirements for Tornado 4.5.3 (vendored as salt.ext.tornado)
+backports-abc==0.5
+singledispatch==3.4.0.3
+# Required by Tornado to handle threads stuff.
+futures>=2.0; python_version < '3.0'

requirements/static/py2.7/darwin.txt

@@ -123,7 +123,7 @@ strict-rfc3339==0.7
 supervisor==3.3.5 ; python_version < "3"
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version < "3"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py2.7/linux.txt

@@ -10,7 +10,7 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
+backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot, jaraco.functools
 backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 backports.tempfile==1.0   # via moto
@@ -116,14 +116,13 @@ scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
+singledispatch==3.4.0.3
 six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, vcert, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 supervisor==3.3.5 ; python_version < "3"
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version < "3"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py2.7/windows.txt

@@ -119,7 +119,7 @@ strict-rfc3339==0.7
 supervisor==3.3.5 ; python_version < "3"
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version < "3"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0

requirements/static/py3.4/linux.txt

@@ -10,7 +10,7 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
+backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 bcrypt==3.1.6             # via paramiko
@@ -107,13 +107,12 @@ scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
+singledispatch==3.4.0.3
 six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, vcert, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py3.5/darwin.txt

@@ -112,7 +112,7 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py3.5/linux.txt

@@ -10,7 +10,7 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
+backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
@@ -105,13 +105,12 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
+singledispatch==3.4.0.3
 six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, vcert, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py3.5/windows.txt

@@ -109,7 +109,7 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0

requirements/static/py3.6/darwin.txt

@@ -111,7 +111,7 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py3.6/linux.txt

@@ -10,7 +10,7 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
+backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
@@ -104,13 +104,12 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
+singledispatch==3.4.0.3
 six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, vcert, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py3.6/windows.txt

@@ -108,7 +108,7 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0

requirements/static/py3.7/darwin.txt

@@ -111,7 +111,7 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py3.7/linux.txt

@@ -10,9 +10,8 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
+backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
@@ -104,13 +103,12 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
+singledispatch==3.4.0.3
 six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, vcert, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 vcert==0.7.3
 virtualenv==16.4.3

requirements/static/py3.7/windows.txt

@@ -108,7 +108,7 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
+tornado==4.5.3
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0

requirements/static/windows.in

@@ -31,7 +31,6 @@ strict_rfc3339
 supervisor==3.3.5; python_version < '3'
 virtualenv
 timelib
-tornado<5.0
 wmi==1.4.9
 
 # Available template libraries that can be used
@@ -39,3 +38,9 @@ Genshi
 Cheetah3==3.1.0
 Mako
 wempy; python_version <'3'
+
+# Requirements for Tornado 4.5.3 (vendored as salt.ext.tornado)
+backports-abc==0.5
+singledispatch==3.4.0.3
+# Required by Tornado to handle threads stuff.
+futures>=2.0; python_version < '3.0'