Merge pull request #52310 from garethgreenaway/merge-2018.3

[2018.3] Merge forward from 2017.7 to 2018.3

noxfile.py

@@ -56,13 +56,24 @@ def _install_requirements(session, *extra_requirements):
     # Install requirements
     distro_requirements = None
 
-    if not IS_WINDOWS:
+    if IS_WINDOWS:
+        _distro_requirements = os.path.join(REPO_ROOT, 'requirements', 'static', 'windows.txt')
+        if os.path.exists(_distro_requirements):
+            with open(_distro_requirements) as rfh:
+                if 'ioflo' in rfh.read():
+                    # Because we still install ioflo, which requires setuptools-git, which fails with a
+                    # weird SSL certificate issue(weird because the requirements file requirements install
+                    # fine), let's previously have setuptools-git installed
+                    session.install('setuptools-git')
+            distro_requirements = _distro_requirements
+    else:
         # The distro package doesn't output anything for Windows
         session.install('distro')
         output = session.run('distro', '-j', silent=True)
         distro = json.loads(output.strip())
         session.log('Distro information:\n%s', pprint.pformat(distro))
         distro_keys = [
+            '{id}'.format(**distro),
             '{id}-{version}'.format(**distro),
             '{id}-{version_parts[major]}'.format(**distro)
         ]
@@ -120,11 +131,6 @@ def _install_requirements(session, *extra_requirements):
     if extra_requirements:
         session.install(*extra_requirements)
 
-    if IS_WINDOWS:
-        # Windows hacks :/
-        nox_windows_setup = os.path.join(REPO_ROOT, 'tests', 'support', 'nox-windows-setup.py')
-        session.run('python', nox_windows_setup)
-
 
 def _run_with_coverage(session, *test_cmd):
     session.install('coverage==4.5.3')
@@ -149,7 +155,7 @@ def _run_with_coverage(session, *test_cmd):
 @nox.parametrize('coverage', [False, True])
 def runtests(session, coverage):
     # Install requirements
-    _install_requirements(session, 'unittest-xml-reporting<2.4.0')
+    _install_requirements(session, 'unittest-xml-reporting==2.2.1')
     # Create required artifacts directories
     _create_ci_directories()
 

requirements/static/arch.in

@@ -0,0 +1,34 @@
+# This is a compilation of requirements installed on salt-jenkins git.salt state run
+apache-libcloud==1.0.0
+boto3
+boto>=2.46.0
+cffi
+cherrypy==17.3.0
+dnspython
+docker
+futures>=2.0; python_version < '3.0'
+GitPython
+ioflo
+jsonschema<=2.6.0
+keyring==5.7.1
+kubernetes<4.0
+mock<1.1.0
+more-itertools==5.0.0
+moto
+msgpack-python >= 0.4.2, != 0.5.5
+psutil
+pycrypto>=2.6.1
+pyinotify
+pyopenssl
+python-etcd==0.4.2
+python-gnupg
+pyvmomi
+pyzmq
+requests
+rfc3987
+salttesting==2017.6.1
+setproctitle
+strict_rfc3339
+timelib
+tornado<5.0
+virtualenv

requirements/static/arch.txt

@@ -0,0 +1,109 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile -o requirements/static/arch.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/arch.in
+#
+apache-libcloud==1.0.0
+asn1crypto==0.24.0        # via cryptography
+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.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
+backports.weakref==1.0.post1  # via backports.tempfile
+boto3==1.9.118
+boto==2.49.0
+botocore==1.12.118        # via boto3, moto, s3transfer
+cachetools==3.1.0         # via google-auth
+certifi==2019.3.9         # via kubernetes, requests, tornado
+cffi==1.12.2
+chardet==3.0.4            # via requests
+cheroot==6.5.4            # via cherrypy
+cherrypy==17.3.0
+contextlib2==0.5.5        # via cherrypy
+cookies==2.2.1            # via responses
+coverage==4.5.3           # via pytest-cov
+cryptography==2.6.1       # via moto, pyopenssl
+dnspython==1.16.0
+docker-pycreds==0.4.0     # via docker
+docker==3.7.1
+docutils==0.14            # via botocore
+ecdsa==0.13               # via python-jose
+enum34==1.1.6             # via cryptography
+funcsigs==1.0.2           # via pytest
+functools32==3.2.3.post2  # via jsonschema
+future==0.17.1            # via python-jose
+futures==3.2.0 ; python_version < "3.0"
+gitdb2==2.0.5             # via gitpython
+gitpython==2.1.11
+google-auth==1.6.3        # via kubernetes
+idna==2.8                 # via requests
+ioflo==1.7.5
+ipaddress==1.0.22         # via cryptography, docker, kubernetes
+jaraco.functools==2.0     # via tempora
+jinja2==2.10
+jmespath==0.9.4           # via boto3, botocore
+jsondiff==1.1.1           # via moto
+jsonpickle==1.1           # via aws-xray-sdk
+jsonschema==2.6.0
+keyring==5.7.1
+kubernetes==3.0.0
+markupsafe==1.1.1
+mock==1.0.1
+more-itertools==5.0.0
+moto==1.3.7
+msgpack-python==0.5.6
+msgpack==0.6.1
+pathlib2==2.3.3           # via pytest
+pluggy==0.9.0             # via pytest
+portend==2.3              # via cherrypy
+psutil==5.6.1
+py==1.8.0                 # via pytest
+pyaml==18.11.0            # via moto
+pyasn1-modules==0.2.4     # via google-auth
+pyasn1==0.4.5             # via pyasn1-modules, rsa
+pycparser==2.19           # via cffi
+pycrypto==2.6.1
+pycryptodome==3.7.3       # via python-jose
+pyinotify==0.9.6
+pyopenssl==19.0.0
+pytest-cov==2.6.1
+pytest-helpers-namespace==2019.1.8
+pytest-salt-runtests-bridge==2019.1.30
+pytest-salt==2018.12.8
+pytest-tempdir==2018.8.11
+pytest-timeout==1.3.3
+pytest==4.3.1
+python-dateutil==2.8.0    # via botocore, kubernetes, moto
+python-etcd==0.4.2
+python-gnupg==0.4.4
+python-jose==2.0.2        # via moto
+pytz==2018.9              # via moto, tempora
+pyvmomi==6.7.1.2018.12
+pyyaml==3.13
+pyzmq==18.0.1 ; python_version != "3.4"
+requests==2.21.0
+responses==0.10.6         # via moto
+rfc3987==1.3.8
+rsa==4.0                  # via google-auth
+s3transfer==0.2.0         # via boto3
+salttesting==2017.6.1
+scandir==1.10.0           # via pathlib2
+setproctitle==1.1.10
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+smmap2==2.0.5             # via gitdb2
+strict-rfc3339==0.7
+tempora==1.14             # via portend
+timelib==0.2.4
+tornado==4.5.3 ; python_version < "3"
+urllib3==1.24.1           # via botocore, kubernetes, python-etcd, requests
+virtualenv==16.4.3
+websocket-client==0.40.0  # via docker, kubernetes
+werkzeug==0.15.0          # via moto
+wrapt==1.11.1             # via aws-xray-sdk
+xmltodict==0.12.0         # via moto
+zc.lockfile==1.4          # via cherrypy

requirements/static/centos-6.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/centos-6.txt requirements/zeromq.txt requirements/raet.txt requirements/pytest.txt requirements/static/centos-6.in
+#    pip-compile -o requirements/static/centos-6.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/centos-6.in
 #
 apache-libcloud==1.0.0
 asn1crypto==0.24.0        # via cryptography
@@ -33,7 +33,7 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.0
 docutils==0.14            # via botocore
 ecdsa==0.13               # via python-jose
-enum34==1.1.6             # via cryptography, raet
+enum34==1.1.6             # via cryptography
 funcsigs==1.0.2           # via pytest
 functools32==3.2.3.post2  # via jsonschema
 future==0.17.1            # via python-jose
@@ -54,7 +54,6 @@ junos-eznc==2.2.0
 jxmlease==1.0.1
 keyring==5.7.1
 kubernetes==3.0.0
-libnacl==1.6.1
 lxml==4.3.2               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
@@ -96,7 +95,6 @@ pytz==2018.9              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==3.13
 pyzmq==18.0.1 ; python_version != "3.4"
-raet==0.6.8
 requests==2.21.0
 responses==0.10.5         # via moto
 rfc3987==1.3.8
@@ -108,7 +106,7 @@ scp==0.13.1               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap==0.9.0              # via gitdb
 strict-rfc3339==0.7
 supervisor==3.3.5 ; python_version < "3"

requirements/static/centos-7.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/centos-7.txt requirements/zeromq.txt requirements/raet.txt requirements/pytest.txt requirements/static/centos-7.in
+#    pip-compile -o requirements/static/centos-7.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/centos-7.in
 #
 apache-libcloud==1.0.0
 asn1crypto==0.24.0        # via cryptography
@@ -33,7 +33,7 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.0
 docutils==0.14            # via botocore
 ecdsa==0.13               # via python-jose
-enum34==1.1.6             # via cryptography, raet
+enum34==1.1.6             # via cryptography
 funcsigs==1.0.2           # via pytest
 functools32==3.2.3.post2  # via jsonschema
 future==0.17.1            # via python-jose
@@ -54,7 +54,6 @@ junos-eznc==2.2.0
 jxmlease==1.0.1
 keyring==5.7.1
 kubernetes==3.0.0
-libnacl==1.6.1
 lxml==4.3.2               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
@@ -96,7 +95,6 @@ pytz==2018.9              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==3.13
 pyzmq==18.0.1 ; python_version != "3.4"
-raet==0.6.8
 requests==2.21.0
 responses==0.10.5         # via moto
 rfc3987==1.3.8
@@ -108,7 +106,7 @@ scp==0.13.1               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 supervisor==3.3.5 ; python_version < "3"

requirements/static/debian-8.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/debian-8.txt requirements/zeromq.txt requirements/raet.txt requirements/pytest.txt requirements/static/debian-8.in
+#    pip-compile -o requirements/static/debian-8.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/debian-8.in
 #
 apache-libcloud==1.0.0
 asn1crypto==0.24.0        # via cryptography
@@ -32,7 +32,7 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.0
 docutils==0.14            # via botocore
 ecdsa==0.13               # via python-jose
-enum34==1.1.6             # via cryptography, raet
+enum34==1.1.6             # via cryptography
 funcsigs==1.0.2           # via pytest
 functools32==3.2.3.post2  # via jsonschema
 future==0.17.1            # via python-jose
@@ -53,7 +53,6 @@ junos-eznc==2.2.0
 jxmlease==1.0.1
 keyring==5.7.1
 kubernetes==3.0.0
-libnacl==1.6.1
 lxml==4.3.2               # via junos-eznc, ncclient
 markupsafe==1.1.1
 mock==1.0.1
@@ -93,7 +92,6 @@ pytz==2018.9              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==3.13
 pyzmq==18.0.1 ; python_version != "3.4"
-raet==0.6.8
 requests==2.21.0
 responses==0.10.5         # via moto
 rfc3987==1.3.8
@@ -105,7 +103,7 @@ scp==0.13.1               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14             # via portend

requirements/static/debian-9.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/debian-9.txt requirements/zeromq.txt requirements/raet.txt requirements/pytest.txt requirements/static/debian-9.in
+#    pip-compile -o requirements/static/debian-9.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/debian-9.in
 #
 apache-libcloud==1.0.0
 asn1crypto==0.24.0        # via cryptography
@@ -32,7 +32,7 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.0
 docutils==0.14            # via botocore
 ecdsa==0.13               # via python-jose
-enum34==1.1.6             # via cryptography, raet
+enum34==1.1.6             # via cryptography
 funcsigs==1.0.2           # via pytest
 functools32==3.2.3.post2  # via jsonschema
 future==0.17.1            # via python-jose
@@ -53,7 +53,6 @@ junos-eznc==2.2.0
 jxmlease==1.0.1
 keyring==5.7.1
 kubernetes==3.0.0
-libnacl==1.6.1
 lxml==4.3.2               # via junos-eznc, ncclient
 markupsafe==1.1.1
 mock==1.0.1
@@ -93,7 +92,6 @@ pytz==2018.9              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==3.13
 pyzmq==18.0.1 ; python_version != "3.4"
-raet==0.6.8
 requests==2.21.0
 responses==0.10.5         # via moto
 rfc3987==1.3.8
@@ -105,7 +103,7 @@ scp==0.13.1               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14             # via portend