From 5f64fbd8863208a15050b78313b4d5db61a41c16 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 31 Jul 2023 15:21:25 +0100 Subject: [PATCH] Bump to `pytest-salt-factories==1.0.0rc25` Signed-off-by: Pedro Algarvio --- requirements/pytest.txt | 3 +-- requirements/static/ci/py3.10/darwin.txt | 7 +------ requirements/static/ci/py3.10/freebsd.txt | 7 +------ requirements/static/ci/py3.10/linux.txt | 7 +------ requirements/static/ci/py3.10/windows.txt | 7 +------ requirements/static/ci/py3.11/darwin.txt | 7 +------ requirements/static/ci/py3.11/freebsd.txt | 7 +------ requirements/static/ci/py3.11/linux.txt | 7 +------ requirements/static/ci/py3.11/windows.txt | 7 +------ requirements/static/ci/py3.8/freebsd.txt | 7 +------ requirements/static/ci/py3.8/linux.txt | 7 +------ requirements/static/ci/py3.8/windows.txt | 7 +------ requirements/static/ci/py3.9/darwin.txt | 7 +------ requirements/static/ci/py3.9/freebsd.txt | 7 +------ requirements/static/ci/py3.9/linux.txt | 7 +------ requirements/static/ci/py3.9/windows.txt | 7 +------ tests/conftest.py | 13 +------------ 17 files changed, 17 insertions(+), 104 deletions(-) diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 010052e43ea..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.0rc24 -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/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 8de81ffe88d..89f606aebe7 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -371,10 +371,6 @@ pytest-subtests==0.11.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.3.2 @@ -387,7 +383,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 6beaeb46c45..2c6ba361fb4 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -352,7 +352,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -365,10 +365,6 @@ pytest-subtests==0.11.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.3.2 @@ -381,7 +377,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 86f0a94601a..bf6ba4d7db1 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -386,7 +386,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -399,10 +399,6 @@ pytest-subtests==0.11.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.3.2 @@ -415,7 +411,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 5d7b93c0096..33470c5c9b6 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -312,7 +312,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -325,10 +325,6 @@ pytest-subtests==0.11.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.3.2 @@ -341,7 +337,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 7d36dbe7d15..3e082565e84 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -356,7 +356,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -369,10 +369,6 @@ pytest-subtests==0.11.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.3.2 @@ -385,7 +381,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index aa074a3b6ba..926427b28ca 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -350,7 +350,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -363,10 +363,6 @@ pytest-subtests==0.11.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.3.2 @@ -379,7 +375,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 290ab9830d4..07ec5be7525 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -382,7 +382,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -395,10 +395,6 @@ pytest-subtests==0.11.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.3.2 @@ -411,7 +407,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index b23d68eae7d..762be17626d 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -310,7 +310,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -323,10 +323,6 @@ pytest-subtests==0.11.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.3.2 @@ -339,7 +335,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 4864a8765d4..cb198d7902f 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -355,7 +355,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -368,10 +368,6 @@ pytest-subtests==0.11.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.3.2 @@ -384,7 +380,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 5a469fb4251..1357e34628a 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -390,7 +390,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -403,10 +403,6 @@ pytest-subtests==0.11.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.3.2 @@ -419,7 +415,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 23b2fb53238..a7fe603d804 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -316,7 +316,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -329,10 +329,6 @@ pytest-subtests==0.11.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.3.2 @@ -345,7 +341,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 3592b10a268..eff0d5f5d4b 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -371,10 +371,6 @@ pytest-subtests==0.11.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.3.2 @@ -387,7 +383,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 212a1e771f9..252dc2880c1 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -352,7 +352,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -365,10 +365,6 @@ pytest-subtests==0.11.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.3.2 @@ -381,7 +377,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 20ee095bdf3..b16ead8e6b0 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -388,7 +388,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -401,10 +401,6 @@ pytest-subtests==0.11.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.3.2 @@ -417,7 +413,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-consul==1.1.0 # via -r requirements/static/ci/linux.in diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 02a54b73a39..1eb2c8be733 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -312,7 +312,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc24 +pytest-salt-factories==1.0.0rc25 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories @@ -325,10 +325,6 @@ pytest-subtests==0.11.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.3.2 @@ -341,7 +337,6 @@ pytest==7.3.2 # pytest-skip-markers # pytest-subtests # pytest-system-statistics - # pytest-tempdir # pytest-timeout python-dateutil==2.8.2 # via diff --git a/tests/conftest.py b/tests/conftest.py index 898df041412..4dfeb95c6aa 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): """