diff --git a/noxfile.py b/noxfile.py index 7e255b06656..e8b2ca514e6 100644 --- a/noxfile.py +++ b/noxfile.py @@ -607,7 +607,7 @@ def pytest_parametrized(session, coverage, transport, crypto): REPO_ROOT, "--log-file={}".format(RUNTESTS_LOGFILE), "--log-file-level=debug", - "--no-print-logs", + "--show-capture=no", "-ra", "-s", "--transport={}".format(transport), @@ -749,7 +749,7 @@ def pytest_cloud(session, coverage): REPO_ROOT, "--log-file={}".format(RUNTESTS_LOGFILE), "--log-file-level=debug", - "--no-print-logs", + "--show-capture=no", "-ra", "-s", "--run-expensive", @@ -772,7 +772,7 @@ def pytest_tornado(session, coverage): REPO_ROOT, "--log-file={}".format(RUNTESTS_LOGFILE), "--log-file-level=debug", - "--no-print-logs", + "--show-capture=no", "-ra", "-s", ] + session.posargs diff --git a/pytest.ini b/pytest.ini index dfda975aa1f..fca3fdcdbed 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,5 +1,4 @@ [pytest] -log_print=false log_date_format=%H:%M:%S log_cli_format=%(asctime)s,%(msecs)03.0f [%(name)-5s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)s)] %(message)s log_file_format=%(asctime)s,%(msecs)03d [%(name)-17s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)d)] %(message)s @@ -8,3 +7,4 @@ testpaths=tests python_files=test_*.py python_classes=Test* python_functions = test_* +junit_family=xunit2 diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 4f93286851f..7436f78e5af 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -1,6 +1,8 @@ mock >= 3.0.0 # PyTest -pytest >=4.6.9,<4.7 # PyTest 4.6.x are the last Py2 and Py3 releases +pytest >= 5.4.2; sys_platform != "win32" +# https://github.com/pytest-dev/pytest/issues/6964#issuecomment-632727439 +pytest >=4.6.9,<4.7; sys_platform == "win32" pytest-salt pytest-salt-factories >= 0.10.5 pytest-tempdir >= 2019.10.12 diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt index ba7648505f3..7eadfc574a8 100644 --- a/requirements/static/py3.5/darwin.txt +++ b/requirements/static/py3.5/darwin.txt @@ -8,7 +8,6 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog 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.functools-lru-cache==1.5 # via cheroot @@ -95,7 +94,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 @@ -112,7 +111,7 @@ s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.5/linux.txt b/requirements/static/py3.5/linux.txt index 9fefa9b3aa3..769820fc3be 100644 --- a/requirements/static/py3.5/linux.txt +++ b/requirements/static/py3.5/linux.txt @@ -9,7 +9,6 @@ apache-libcloud==2.0.0 appdirs==1.4.4 # via virtualenv argh==0.26.2 # via watchdog 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 azure-applicationinsights==0.1.0 # via azure @@ -185,7 +184,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert python-etcd==0.4.5 python-gnupg==0.4.4 @@ -204,7 +203,7 @@ salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 setuptools-scm==3.2.0 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.5/windows.txt b/requirements/static/py3.5/windows.txt index c6d429e1197..3029980ce57 100644 --- a/requirements/static/py3.5/windows.txt +++ b/requirements/static/py3.5/windows.txt @@ -89,7 +89,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==4.6.9 ; sys_platform == "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt index 051aed0f428..f47817fb5d6 100644 --- a/requirements/static/py3.6/darwin.txt +++ b/requirements/static/py3.6/darwin.txt @@ -8,7 +8,6 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog 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.functools-lru-cache==1.5 # via cheroot @@ -94,7 +93,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 @@ -111,7 +110,7 @@ s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.6/linux.txt b/requirements/static/py3.6/linux.txt index adacf5e65e3..8db70179fc5 100644 --- a/requirements/static/py3.6/linux.txt +++ b/requirements/static/py3.6/linux.txt @@ -9,7 +9,6 @@ apache-libcloud==2.0.0 appdirs==1.4.4 # via virtualenv argh==0.26.2 # via watchdog 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 azure-applicationinsights==0.1.0 # via azure @@ -184,7 +183,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert python-etcd==0.4.5 python-gnupg==0.4.4 @@ -203,7 +202,7 @@ salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 setuptools-scm==3.2.0 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.6/windows.txt b/requirements/static/py3.6/windows.txt index 790d72bf52f..2ed2ec8768d 100644 --- a/requirements/static/py3.6/windows.txt +++ b/requirements/static/py3.6/windows.txt @@ -88,7 +88,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==4.6.9 ; sys_platform == "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt index 163b8205659..79d0aa6a532 100644 --- a/requirements/static/py3.7/darwin.txt +++ b/requirements/static/py3.7/darwin.txt @@ -8,7 +8,6 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog 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.functools-lru-cache==1.5 # via cheroot @@ -93,7 +92,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 @@ -110,7 +109,7 @@ s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.7/linux.txt b/requirements/static/py3.7/linux.txt index 5d5a033d8d7..c2b3c6545d6 100644 --- a/requirements/static/py3.7/linux.txt +++ b/requirements/static/py3.7/linux.txt @@ -9,7 +9,6 @@ apache-libcloud==2.0.0 appdirs==1.4.4 # via virtualenv argh==0.26.2 # via watchdog 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 azure-applicationinsights==0.1.0 # via azure @@ -183,7 +182,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert python-etcd==0.4.5 python-gnupg==0.4.4 @@ -202,7 +201,7 @@ salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 setuptools-scm==3.2.0 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.7/windows.txt b/requirements/static/py3.7/windows.txt index ceb7333cbfb..77f0e58e1a1 100644 --- a/requirements/static/py3.7/windows.txt +++ b/requirements/static/py3.7/windows.txt @@ -86,7 +86,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==4.6.9 ; sys_platform == "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 diff --git a/requirements/static/py3.8/darwin.txt b/requirements/static/py3.8/darwin.txt index b18ca7c59f5..be4fb7c85fc 100644 --- a/requirements/static/py3.8/darwin.txt +++ b/requirements/static/py3.8/darwin.txt @@ -8,7 +8,6 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog 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.functools-lru-cache==1.5 # via cheroot @@ -92,7 +91,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 @@ -109,7 +108,7 @@ s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.8/linux.txt b/requirements/static/py3.8/linux.txt index 4b6084064eb..b244f44383c 100644 --- a/requirements/static/py3.8/linux.txt +++ b/requirements/static/py3.8/linux.txt @@ -9,7 +9,6 @@ apache-libcloud==2.0.0 appdirs==1.4.4 # via virtualenv argh==0.26.2 # via watchdog 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 azure-applicationinsights==0.1.0 # via azure @@ -183,7 +182,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert python-etcd==0.4.5 python-gnupg==0.4.4 @@ -202,7 +201,7 @@ salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 setuptools-scm==3.2.0 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend diff --git a/requirements/static/py3.9/darwin.txt b/requirements/static/py3.9/darwin.txt index 324ff9f5780..18a03920ebf 100644 --- a/requirements/static/py3.9/darwin.txt +++ b/requirements/static/py3.9/darwin.txt @@ -8,7 +8,6 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog 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.functools-lru-cache==1.5 # via cheroot @@ -92,7 +91,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 python-etcd==0.4.5 python-gnupg==0.4.4 @@ -109,7 +108,7 @@ s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==3.0.1 # via gitdb2 smmap==3.0.4 # via smmap2 strict-rfc3339==0.7 diff --git a/requirements/static/py3.9/linux.txt b/requirements/static/py3.9/linux.txt index a5107473a57..80c7e0a1ceb 100644 --- a/requirements/static/py3.9/linux.txt +++ b/requirements/static/py3.9/linux.txt @@ -9,7 +9,6 @@ apache-libcloud==2.0.0 appdirs==1.4.4 # via virtualenv argh==0.26.2 # via watchdog 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 azure-applicationinsights==0.1.0 # via azure @@ -183,7 +182,7 @@ pytest-salt-factories==0.10.5 pytest-salt-runtests-bridge==2019.12.5 pytest-salt==2020.1.27 pytest-tempdir==2019.10.12 -pytest==4.6.9 +pytest==5.4.2 ; sys_platform != "win32" python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert python-etcd==0.4.5 python-gnupg==0.4.4 @@ -202,7 +201,7 @@ salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 setuptools-scm==3.2.0 -six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client +six==1.12.0 # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 strict-rfc3339==0.7 tempora==1.14.1 # via portend