Move tornado requirements to os base files

pkg/osx/req.txt

@@ -31,5 +31,4 @@ setproctitle
 singledispatch==3.4.0.3
 smmap==0.9.0
 timelib==0.2.4
-tornado==4.5.3
 vultr==1.0.1

pkg/windows/req.txt

@@ -36,6 +36,10 @@ setproctitle
 singledispatch==3.4.0.3
 smmap==0.9.0
 timelib==0.2.4
-tornado==4.5.3
 watchdog==0.9.0
 wheel==0.33.4
+# 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/base.txt

@@ -5,3 +5,8 @@ msgpack>=0.5,!=0.5.5
 PyYAML
 MarkupSafe
 requests>=1.0.0
+# 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/darwin.in

@@ -35,9 +35,3 @@ 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

@@ -49,9 +49,3 @@ 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,6 @@ 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
 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,6 @@ 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
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0

requirements/static/py3.5/darwin.txt

@@ -112,7 +112,6 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.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/windows.txt

@@ -109,7 +109,6 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.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

@@ -10,9 +10,9 @@ 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
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl_match_hostname==3.7.0.1
+backports_abc==0.5
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
@@ -111,7 +111,6 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.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/windows.txt

@@ -108,7 +108,6 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.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,6 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.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/windows.txt

@@ -108,7 +108,6 @@ smmap==0.9.0
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
 timelib==0.2.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

@@ -39,8 +39,3 @@ 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'