diff --git a/requirements/pytest.txt b/requirements/pytest.txt index d4227c33e17..291498a7009 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -2,8 +2,7 @@ mock >= 3.0.0 # PyTest docker pytest >= 7.2.0 -pytest-salt-factories >= 1.0.0rc21 -pytest-tempdir >= 2019.10.12 +pytest-salt-factories >= 1.0.0rc25 pytest-helpers-namespace >= 2019.1.8 pytest-subtests pytest-timeout diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 115d9688fd0..bdce3b8281f 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -22,7 +22,7 @@ asn1crypto==1.4.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==21.2.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -696,11 +696,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -709,10 +709,6 @@ pytest-subtests==0.5.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -725,7 +721,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via @@ -756,6 +751,7 @@ pyyaml==6.0.1 # clustershell # junos-eznc # kubernetes + # pytest-salt-factories # yamlordereddictloader pyzmq==23.2.0 # via diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 77af9102fdb..4a1afad094b 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -22,7 +22,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -691,11 +691,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -704,10 +704,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -720,7 +716,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.0 # via @@ -749,6 +744,7 @@ pyyaml==6.0.1 # clustershell # junos-eznc # kubernetes + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index a6524bfc962..c9e2c1415b9 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -20,7 +20,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -691,11 +691,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -704,10 +704,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -720,7 +716,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -749,6 +744,7 @@ pyyaml==6.0.1 # clustershell # junos-eznc # kubernetes + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 25760eb4e64..52eafc6932b 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -26,7 +26,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -708,11 +708,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -721,10 +721,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -737,7 +733,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in @@ -775,6 +770,7 @@ pyyaml==6.0.1 # clustershell # junos-eznc # kubernetes + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.10/pkgtests-windows.txt b/requirements/static/ci/py3.10/pkgtests-windows.txt index 88e31addbb2..3e6d0a345e3 100644 --- a/requirements/static/ci/py3.10/pkgtests-windows.txt +++ b/requirements/static/ci/py3.10/pkgtests-windows.txt @@ -109,9 +109,9 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-salt-factories==1.0.0rc17 # via -r requirements/static/ci/pkgtests-windows.in -pytest-shell-utilities==1.7.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.4.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities diff --git a/requirements/static/ci/py3.10/pkgtests.txt b/requirements/static/ci/py3.10/pkgtests.txt index 127e64a8857..42a26e591ac 100644 --- a/requirements/static/ci/py3.10/pkgtests.txt +++ b/requirements/static/ci/py3.10/pkgtests.txt @@ -102,9 +102,9 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-salt-factories==1.0.0rc17 # via -r requirements/static/ci/pkgtests.in -pytest-shell-utilities==1.7.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.4.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index a6aebc76678..e155ab0b601 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -10,7 +10,7 @@ aiosignal==1.3.1 # via aiohttp async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -257,11 +257,11 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.6 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.7.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.3.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -270,10 +270,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==2.1.0 # via -r requirements/pytest.txt pytest==7.2.0 @@ -286,7 +282,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -318,6 +313,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # clustershell # kubernetes + # pytest-salt-factories # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 2643be1e2bc..e6d4de52a71 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -24,7 +24,7 @@ async-timeout==4.0.2 # via aiohttp asynctest==0.13.0 # via aiohttp -attrs==21.2.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -456,6 +456,7 @@ immutables==0.19 importlib-metadata==4.8.1 # via # -r requirements/static/pkg/linux.in + # attrs # backports.entry-points-selectable # click # jsonschema @@ -740,11 +741,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -753,10 +754,6 @@ pytest-subtests==0.5.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -769,7 +766,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via @@ -801,6 +797,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamlordereddictloader pyzmq==23.2.0 # via diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 74cb3bc66ec..b576467683b 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -22,7 +22,7 @@ async-timeout==4.0.2 # via aiohttp asynctest==0.13.0 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -455,6 +455,7 @@ immutables==0.15 importlib-metadata==4.6.4 # via # -r requirements/static/pkg/freebsd.in + # attrs # backports.entry-points-selectable # jsonschema # mako @@ -729,11 +730,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -742,10 +743,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -758,7 +755,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -788,6 +784,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 4135e89f2ba..1b37c77401b 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -28,7 +28,7 @@ async-timeout==4.0.2 # via aiohttp asynctest==0.13.0 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -469,6 +469,7 @@ immutables==0.15 importlib-metadata==4.6.4 # via # -r requirements/static/pkg/linux.in + # attrs # backports.entry-points-selectable # jsonschema # mako @@ -748,11 +749,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -761,10 +762,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -777,7 +774,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in @@ -816,6 +812,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 49caaefdc6f..8f2781c98b9 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -12,7 +12,7 @@ async-timeout==4.0.2 # via aiohttp asynctest==0.13.0 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -135,6 +135,7 @@ immutables==0.15 importlib-metadata==4.6.4 # via # -r requirements/windows.txt + # attrs # backports.entry-points-selectable # jsonschema # mako @@ -270,11 +271,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -283,10 +284,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -299,7 +296,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -332,6 +328,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # clustershell # kubernetes + # pytest-salt-factories # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 4154ff64bba..157f14a6876 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -22,7 +22,7 @@ asn1crypto==1.4.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==21.2.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -729,11 +729,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -742,10 +742,6 @@ pytest-subtests==0.5.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -758,7 +754,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via @@ -790,6 +785,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamlordereddictloader pyzmq==23.2.0 # via diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 73bcb24fcd4..986d60ec621 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -20,7 +20,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -719,11 +719,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -732,10 +732,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -748,7 +744,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -778,6 +773,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index abe4a22ae2f..9bb4f2ac38a 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -26,7 +26,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -736,11 +736,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -749,10 +749,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -765,7 +761,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in @@ -804,6 +799,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index a26899adb10..a06fc1ad0d5 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -10,7 +10,7 @@ aiosignal==1.2.0 # via aiohttp async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -258,11 +258,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -271,10 +271,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -287,7 +283,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -320,6 +315,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # clustershell # kubernetes + # pytest-salt-factories # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 13768b6be45..761bcc6c268 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -22,7 +22,7 @@ asn1crypto==1.4.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==21.2.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -732,11 +732,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -745,10 +745,6 @@ pytest-subtests==0.5.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -761,7 +757,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via @@ -793,6 +788,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamlordereddictloader pyzmq==23.2.0 # via diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 295fdcf549f..bdd65d480a6 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -22,7 +22,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -722,11 +722,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -735,10 +735,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -751,7 +747,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.0 # via @@ -781,6 +776,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 221ef4a0331..7c6c6a7da7c 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -20,7 +20,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -722,11 +722,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -735,10 +735,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -751,7 +747,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -781,6 +776,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 0a5ff850d55..aa0b9a03e0f 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -26,7 +26,7 @@ asn1crypto==1.3.0 # oscrypto async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -741,11 +741,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -754,10 +754,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -770,7 +766,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in @@ -809,6 +804,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # pytest-salt-factories # yamllint # yamlordereddictloader pyzmq==23.2.0 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index b0f16d8fd87..d34a90d577e 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -10,7 +10,7 @@ aiosignal==1.2.0 # via aiohttp async-timeout==4.0.2 # via aiohttp -attrs==20.3.0 +attrs==23.1.0 # via # aiohttp # jsonschema @@ -259,11 +259,11 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc21 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt -pytest-shell-utilities==1.6.0 +pytest-shell-utilities==1.8.0 # via pytest-salt-factories -pytest-skip-markers==1.2.0 +pytest-skip-markers==1.4.1 # via # pytest-salt-factories # pytest-shell-utilities @@ -272,10 +272,6 @@ pytest-subtests==0.4.0 # via -r requirements/pytest.txt pytest-system-statistics==1.0.2 # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via - # -r requirements/pytest.txt - # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt pytest==7.2.0 @@ -288,7 +284,6 @@ pytest==7.2.0 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.1 # via @@ -321,6 +316,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # clustershell # kubernetes + # pytest-salt-factories # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via diff --git a/tests/conftest.py b/tests/conftest.py index 361076e0e17..f99214d7198 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -67,7 +67,7 @@ else: os.environ["COVERAGE_PROCESS_START"] = str(COVERAGERC_FILE) # Define the pytest plugins we rely on -pytest_plugins = ["tempdir", "helpers_namespace"] +pytest_plugins = ["helpers_namespace"] # Define where not to collect tests from collect_ignore = ["setup.py"] @@ -112,17 +112,6 @@ logging.root.setLevel(logging.WARNING) log = logging.getLogger("salt.testsuite") -# ----- PyTest Tempdir Plugin Hooks ---------------------------------------------------------------------------------> -def pytest_tempdir_basename(): - """ - Return the temporary directory basename for the salt test suite. - """ - return "stsuite" - - -# <---- PyTest Tempdir Plugin Hooks ---------------------------------------------------------------------------------- - - # ----- CLI Options Setup -------------------------------------------------------------------------------------------> def pytest_addoption(parser): """