commit: 300f16d8ef3c5627cfe71b94134a804cea0814a3 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Apr 22 11:41:43 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu May 1 11:35:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300f16d8
dev-python/pytest-salt-factories: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/41697 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pytest-salt-factories/Manifest | 3 - .../pytest-salt-factories-1.0.0_rc20-tests.patch | 423 --------------------- .../pytest-salt-factories-1.0.0_rc20-r1.ebuild | 77 ---- .../pytest-salt-factories-1.0.0_rc23.ebuild | 79 ---- .../pytest-salt-factories-1.0.0_rc28.ebuild | 86 ----- 5 files changed, 668 deletions(-) diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest index 5faadd42178a..cda1c2e66546 100644 --- a/dev-python/pytest-salt-factories/Manifest +++ b/dev-python/pytest-salt-factories/Manifest @@ -1,5 +1,2 @@ -DIST pytest-salt-factories-1.0.0_rc20.gh.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b -DIST pytest-salt-factories-1.0.0_rc23.gh.tar.gz 162711 BLAKE2B 28610679d7717d7a6f97a2f14a1ac838aec5101171ae65f2328d9b902d04b272c5e37f08d8ff3414af52ff7af954da24c083dfdc4afd1a9342b09cce0bf5aec3 SHA512 22d8f4a1c48a144437b9ff7d064760b59bb2a1003838e07f446a6150a77c162bffa7f21c570f796d8214d870d5b029e92abf7b0410ce19726085b607628364f0 -DIST pytest-salt-factories-1.0.0_rc28.gh.tar.gz 168150 BLAKE2B c286c2a3933f8a987f1073ba97097cec29bf494cac9c4ba21ec4c261e22570ac3445900cacf629cce6253fb1a5fb95eb3d637b4d26e8835648dd11c569a7255e SHA512 ea362daa83007d9054b023ca9c11864ba304d802fa359c8cb883aa929f339c5347d50560a2d4a9cbc151a7b05bc46d1dc2f7693dd32d26383766cb5f249f3484 DIST pytest-salt-factories-1.0.0_rc29.gh.tar.gz 168690 BLAKE2B d365cdef727e6ed0c0d2d06ce3c8731ddf67181d4d8386d106b7569c709fc5336529c72e907d44496463b47b18659376a64c79b08d45aaa5aa7d8d927a646db3 SHA512 7dd0e9d5bb6e4b292ef145f6fec770435f1cd23a07be67c98e155b1aa3a34bec1c542d97a6cae0302ad46e5c2f4e35eadb45bd7ea8979c05c6ddf1aacde9f755 DIST pytest-salt-factories-1.0.1.gh.tar.gz 169610 BLAKE2B 7f24d25ac9713204b3ba922aefbbb7e41de400128670eeba05679f85e6ee838ca8d595908ed442c8760e08be7c0041f936ee0ccfec651de767a4b660e47c136f SHA512 598486f15f00654509a68b0a216d84e1f790b4b9a28c2fd85b809d357d030299db6137e1b15883dc682b3eaa4f29f47b76bd06c1d1a9994028dc0332af972991 diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc20-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc20-tests.patch deleted file mode 100644 index cd201af5b9f3..000000000000 --- a/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc20-tests.patch +++ /dev/null @@ -1,423 +0,0 @@ -diff --git a/src/saltfactories/plugins/__init__.py b/src/saltfactories/plugins/__init__.py -index efb8911..14af8fe 100644 ---- a/src/saltfactories/plugins/__init__.py -+++ b/src/saltfactories/plugins/__init__.py -@@ -28,7 +28,7 @@ def pytest_tempdir_temproot(): - tempdir = "/tmp" - else: - tempdir = os.environ.get("TMPDIR") or tempfile.gettempdir() -- return os.path.abspath(os.path.realpath(tempdir)) -+ return tempdir - - - def pytest_tempdir_basename(): -diff --git a/tests/functional/factories/base/test_salt_daemon_factory.py b/tests/functional/factories/base/test_salt_daemon_factory.py -index 70d8d62..260e40c 100644 ---- a/tests/functional/factories/base/test_salt_daemon_factory.py -+++ b/tests/functional/factories/base/test_salt_daemon_factory.py -@@ -36,7 +36,7 @@ def test_extra_cli_arguments_after_first_failure( - This test asserts that after the first start failure, the extra_cli_arguments_after_first_start_failure - arguments are added - """ -- output_file = tmp_path.joinpath("output.txt").resolve() -+ output_file = tmp_path.joinpath("output.txt") - config = {"conf_file": config_file, "id": master_id} - script = tempfiles.makepyfile( - r""" -diff --git a/tests/functional/factories/daemons/test_container_factory.py b/tests/functional/factories/daemons/test_container_factory.py -index d060214..3837074 100644 ---- a/tests/functional/factories/daemons/test_container_factory.py -+++ b/tests/functional/factories/daemons/test_container_factory.py -@@ -18,6 +18,7 @@ def _connectable_docker_client(): - pytest.skip("Failed to instantiate a docker client: {}".format(exc)) - - [email protected]("Needs network access") - @pytest.mark.parametrize("skip_on_pull_failure", [True, False]) - def test_skip_on_pull_failure(pytester, skip_on_pull_failure): - pytester.makepyfile( -diff --git a/tests/functional/markers/test_requires_salt_modules.py b/tests/functional/markers/test_requires_salt_modules.py -index 97ed1ec..53ff0dd 100644 ---- a/tests/functional/markers/test_requires_salt_modules.py -+++ b/tests/functional/markers/test_requires_salt_modules.py -@@ -1,9 +1,11 @@ - """ - Test the ``@pytest.mark.requires_salt_modules`` marker. - """ -+import sys - import pytest - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - @pytest.mark.parametrize( - "modules", - [ -@@ -29,6 +31,7 @@ def test_has_required_salt_module(pytester, modules): - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*") - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - @pytest.mark.parametrize( - "modules", - [ -@@ -54,6 +57,7 @@ def test_missing_required_salt_module(pytester, modules): - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*") - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - def test_has_required_custom_salt_module(pytester): - pytester.makepyfile( - r""" -diff --git a/tests/functional/markers/test_requires_salt_states.py b/tests/functional/markers/test_requires_salt_states.py -index f6d63a9..ec4b431 100644 ---- a/tests/functional/markers/test_requires_salt_states.py -+++ b/tests/functional/markers/test_requires_salt_states.py -@@ -1,9 +1,11 @@ - """ - Test the ``@pytest.mark.requires_salt_states`` marker. - """ -+import sys - import pytest - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - @pytest.mark.parametrize( - "modules", - [ -@@ -29,6 +31,7 @@ def test_has_required_salt_state(pytester, modules): - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*") - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - @pytest.mark.parametrize( - "modules", - [ -@@ -54,6 +57,7 @@ def test_missing_required_salt_state(pytester, modules): - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*") - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - def test_has_required_custom_salt_state(pytester): - pytester.makepyfile( - r""" -diff --git a/tests/functional/test_sys_info.py b/tests/functional/test_sys_info.py -index c8fbf6e..f18c85d 100644 ---- a/tests/functional/test_sys_info.py -+++ b/tests/functional/test_sys_info.py -@@ -1,9 +1,11 @@ - """ - Tests related to system information reports enabled by the `--sys-info` flag.. - """ -+import sys - import pytest - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - @pytest.mark.parametrize("flag", ["--sysinfo", "--sys-info"]) - def test_sysinfo(pytester, flag): - pytester.makepyfile( -@@ -27,6 +29,7 @@ def test_sysinfo(pytester, flag): - ) - - [email protected](sys.version_info >= (3, 10), reason="test broken on python 3.10") - def test_no_sysinfo(pytester): - pytester.makepyfile( - """ -diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py -index 9c4fdb0..0766fe7 100644 ---- a/tests/integration/factories/cli/test_salt.py -+++ b/tests/integration/factories/cli/test_salt.py -@@ -14,6 +14,7 @@ def salt_minion_2(salt_master, salt_minion): - yield factory - - [email protected]("not compatible with network-sandbox") - def test_merged_json_out(salt_cli, salt_minion, salt_minion_2): - ret = salt_cli.run("test.ping", minion_tgt="*") - assert ret.returncode == 0, ret -@@ -24,6 +25,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2): - assert ret.data[salt_minion_2.id] is True - - [email protected]("not compatible with network-sandbox") - def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2): - ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False) - assert ret.returncode == 0, ret -diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py -index d6fd060..aade16e 100644 ---- a/tests/integration/factories/daemons/api/test_api.py -+++ b/tests/integration/factories/daemons/api/test_api.py -@@ -19,5 +19,6 @@ def salt_api(master): - yield factory - - [email protected]("not compatible with network-sandbox") - def test_api(salt_api): - assert salt_api.is_running() -diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py -index bfab01f..0494ebb 100644 ---- a/tests/integration/factories/daemons/api/test_restarts.py -+++ b/tests/integration/factories/daemons/api/test_restarts.py -@@ -12,6 +12,7 @@ def master(salt_factories): - yield factory - - [email protected]("not compatible with network-sandbox") - def test_multiple_start_stops(master): - factory = master.salt_api_daemon() - assert factory.is_running() is False -diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py -index 648781d..cb051c4 100644 ---- a/tests/integration/factories/daemons/master/test_master.py -+++ b/tests/integration/factories/daemons/master/test_master.py -@@ -1,3 +1,4 @@ -+import sys - import pytest - import salt.defaults.exitcodes - from pytestshellutils.exceptions import FactoryNotStarted -@@ -48,10 +49,12 @@ def salt_call(minion, salt_cli_timeout): - return minion.salt_call_cli(timeout=salt_cli_timeout) - - [email protected]("not compatible with network-sandbox") - def test_master(master): - assert master.is_running() - - [email protected]("not compatible with network-sandbox") - def test_salt_run(master, salt_run): - max_open_files_config_value = master.config["max_open_files"] - ret = salt_run.run("config.get", "max_open_files") -@@ -59,6 +62,7 @@ def test_salt_run(master, salt_run): - assert ret.data == max_open_files_config_value - - [email protected]("Needs network access") - def test_salt_cp_minion_id_as_first_argument(master, minion, salt_cp, tempfiles, tmp_path): - """ - Test copying a file from the master any minions connected -@@ -75,6 +79,7 @@ def test_salt_cp_minion_id_as_first_argument(master, minion, salt_cp, tempfiles, - assert dest.read_text() == contents - - [email protected]("Needs network access") - def test_salt_cp_explicit_minion_tgt(master, minion, salt_cp, tempfiles, tmp_path): - """ - Test copying a file from the master to the minion -@@ -91,6 +96,7 @@ def test_salt_cp_explicit_minion_tgt(master, minion, salt_cp, tempfiles, tmp_pat - assert dest.read_text() == contents - - [email protected]("Needs network access") - def test_salt_cp_no_match(master, minion, salt_cp, tempfiles, tmp_path): - assert master.is_running() - assert minion.is_running() -diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py -index 683970a..443dcfb 100644 ---- a/tests/integration/factories/daemons/master/test_restarts.py -+++ b/tests/integration/factories/daemons/master/test_restarts.py -@@ -11,6 +11,7 @@ def master(salt_factories): - return factory - - [email protected]("not compatible with network") - def test_multiple_start_stops(master): - assert master.is_running() is False - pid = None -diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py -index a6c6420..10626cd 100644 ---- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py -+++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py -@@ -28,6 +28,7 @@ def salt_call_cli(minion): - return minion.salt_call_cli() - - [email protected]("not compatible with network-sandbox") - def test_event_listener_engine(minion, salt_call_cli, event_listener): - """ - There are some events which the minion fires internally that never reach the master. -diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py -index f2799ce..5e2b06a 100644 ---- a/tests/integration/factories/daemons/minion/test_minion.py -+++ b/tests/integration/factories/daemons/minion/test_minion.py -@@ -27,6 +27,7 @@ def salt_call_cli(minion, salt_cli_timeout): - return minion.salt_call_cli(timeout=salt_cli_timeout) - - [email protected]("not compatible with network-sandbox") - def test_minion(minion, salt_cli): - assert minion.is_running() - ret = salt_cli.run("test.ping", minion_tgt=minion.id) -@@ -34,6 +35,7 @@ def test_minion(minion, salt_cli): - assert ret.data is True - - [email protected]("not compatible with network-sandbox") - def test_no_match(minion, salt_cli): - assert minion.is_running() - ret = salt_cli.run("test.ping", minion_tgt="minion-2") -@@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli): - assert not ret.data - - [email protected]("not compatible with network-sandbox") - def test_show_jid(minion, salt_cli): - assert minion.is_running() - ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id) -@@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli): - assert ret.data is True - - [email protected]("not compatible with network-sandbox") - def test_minion_salt_call(minion, salt_call_cli): - assert minion.is_running() - ret = salt_call_cli.run("test.ping") -@@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli): - assert ret.data is True - - [email protected]("not compatible with network-sandbox") - def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli): - ret = salt_call_cli.run( - "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt" -@@ -66,6 +71,7 @@ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli): - assert ret.returncode == 1, ret - - [email protected]("not compatible with sandbox") - def test_state_tree(minion, salt_call_cli): - sls_contents = """ - test: -diff --git a/tests/integration/factories/daemons/minion/test_restarts.py b/tests/integration/factories/daemons/minion/test_restarts.py -index ab1f044..4ac417d 100644 ---- a/tests/integration/factories/daemons/minion/test_restarts.py -+++ b/tests/integration/factories/daemons/minion/test_restarts.py -@@ -10,6 +10,7 @@ def master(salt_factories): - yield factory - - [email protected]("not compatible with network-sandbox") - def test_multiple_start_stops(master): - factory = master.salt_minion_daemon(random_string("minion-")) - assert factory.is_running() is False -diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py -index 579e6f5..e7464ed 100644 ---- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py -+++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py -@@ -36,6 +36,7 @@ def salt_call_cli(proxy_minion, salt_cli_timeout): - return proxy_minion.salt_call_cli(timeout=salt_cli_timeout) - - [email protected]("not compatible with network-sandbox") - def test_proxy_minion(proxy_minion, salt_cli): - assert proxy_minion.is_running() - ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id) -@@ -43,6 +44,7 @@ def test_proxy_minion(proxy_minion, salt_cli): - assert ret.data is True - - [email protected]("not compatible with network-sandbox") - def test_no_match(proxy_minion, salt_cli): - assert proxy_minion.is_running() - ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2") -@@ -50,6 +52,7 @@ def test_no_match(proxy_minion, salt_cli): - assert not ret.data - - [email protected]("not compatible with network-sandbox") - def test_show_jid(proxy_minion, salt_cli): - if platform.is_darwin() and sys.version_info[:2] == (3, 7): - pytest.skip( -@@ -62,6 +65,7 @@ def test_show_jid(proxy_minion, salt_cli): - assert ret.data is True - - [email protected]("not compatible with network-sandbox") - def test_proxy_minion_salt_call(proxy_minion, salt_call_cli): - assert proxy_minion.is_running() - ret = salt_call_cli.run("test.ping") -@@ -73,6 +77,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli): - assert ret.data is True - - [email protected]("not compatible with sandbox") - def test_state_tree(proxy_minion, salt_call_cli): - sls_contents = """ - test: -diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py -index a243c6d..7758c96 100644 ---- a/tests/integration/factories/daemons/proxy/test_restarts.py -+++ b/tests/integration/factories/daemons/proxy/test_restarts.py -@@ -16,6 +16,7 @@ def master(salt_factories): - yield factory - - [email protected]("not compatible with sandbox") - def test_multiple_start_stops(master): - factory = master.salt_proxy_minion_daemon(random_string("proxy-minion-")) - assert factory.is_running() is False -diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py -index 832a2d3..a586c4f 100644 ---- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py -+++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py -@@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master): - - - @pytest.mark.skip_on_windows [email protected]("not compatible with network-sandbox") - def test_salt_ssh(salt_ssh_cli): - ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost") - assert ret.returncode == 0 -diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py -index 3b425fc..3e03636 100644 ---- a/tests/integration/factories/daemons/sshd/test_sshd.py -+++ b/tests/integration/factories/daemons/sshd/test_sshd.py -@@ -5,6 +5,7 @@ import pytest - - @pytest.fixture(scope="module") - @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen") [email protected]("not compatible with network-sandbox") - def sshd(salt_factories): - # Set StrictModes to no because our config directory lives in /tmp and those permissions - # are not acceptable by sshd strict paranoia. -@@ -15,12 +16,14 @@ def sshd(salt_factories): - - - @pytest.mark.skip_on_windows [email protected]("not compatible with network-sandbox") - def test_sshd(sshd): - assert sshd.is_running() - - - @pytest.mark.skip_on_windows - @pytest.mark.skip_if_binaries_missing("ssh") [email protected]("not compatible with network-sandbox") - def test_connect(sshd): - cmd = subprocess.run( - [ -diff --git a/tests/integration/utils/saltext/test_log_handlers.py b/tests/integration/utils/saltext/test_log_handlers.py -index 6d5b9c0..edc5b5a 100644 ---- a/tests/integration/utils/saltext/test_log_handlers.py -+++ b/tests/integration/utils/saltext/test_log_handlers.py -@@ -24,6 +24,7 @@ def salt_cli(master): - return master.salt_cli() - - [email protected]("Not compatible with sandbox") - def test_logs_forwarded_from_sub_processes(salt_cli, minion, caplog): - assert minion.is_running() - -diff --git a/tests/scenarios/examples/test_echoext.py b/tests/scenarios/examples/test_echoext.py -index 238a442..d827467 100644 ---- a/tests/scenarios/examples/test_echoext.py -+++ b/tests/scenarios/examples/test_echoext.py -@@ -1,6 +1,8 @@ - from saltfactories import CODE_ROOT_DIR - -+import pytest - [email protected]("Incompatible with sandbox") - def test_echoext(extension_venv): - extension_path = CODE_ROOT_DIR.parent.parent / "examples" / "echo-extension" - with extension_venv(extension_path) as venv: diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild deleted file mode 100644 index 519227386942..000000000000 --- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -DESCRIPTION="The new generation of the pytest-salt Plugin" -HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"; -SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.gh.tar.gz" -S=${WORKDIR}/${PN}-${PV//_/} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="test" - -RDEPEND=" - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - >=dev-python/pytest-6.0.0[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-skip-markers[${PYTHON_USEDEP}] - dev-python/pytest-system-statistics[${PYTHON_USEDEP}] - >=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}] - dev-python/pyzmq[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - >=app-admin/salt-3001.0[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/pyfakefs[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/pytest-salt-factories-1.0.0_rc20-tests.patch" -) - -distutils_enable_tests pytest - -python_prepare_all() { - sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die - sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die - - sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die - printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die - distutils-r1_python_prepare_all -} - -python_test() { - local tempdir - - local -a disable_tests=( - testexcludetest - ) - local textexpr - testexpr=$(printf 'not %s and ' "${disable_tests[@]}") - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" || die - addwrite "${tempdir}" - - ( - cleanup() { rm -rf "${tempdir}" || die; } - - trap cleanup EXIT - export SHELL="/bin/bash" TMPDIR="${tempdir}" - epytest -vv -k "${testexpr%and }" - ) -} diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild deleted file mode 100644 index 1704720e0f37..000000000000 --- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -DESCRIPTION="The new generation of the pytest-salt Plugin" -HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"; -SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.gh.tar.gz" -S=${WORKDIR}/${PN}-${PV//_/} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="test" - -RDEPEND=" - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/docker[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - >=dev-python/pytest-6.0.0[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-skip-markers[${PYTHON_USEDEP}] - dev-python/pytest-system-statistics[${PYTHON_USEDEP}] - >=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}] - dev-python/pyzmq[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - >=app-admin/salt-3001.0[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/pyfakefs[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/pytest-salt-factories-1.0.0_rc20-tests.patch" -) - -distutils_enable_tests pytest - -python_prepare_all() { - sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die - sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die - - sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die - printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die - distutils-r1_python_prepare_all -} - -python_test() { - local tempdir - - local -a disable_tests=( - testexcludetest - test_version_info - ) - local textexpr - testexpr=$(printf 'not %s and ' "${disable_tests[@]}") - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" || die - addwrite "${tempdir}" - - ( - cleanup() { rm -rf "${tempdir}" || die; } - - trap cleanup EXIT - export SHELL="/bin/bash" TMPDIR="${tempdir}" - epytest -vv -k "${testexpr%and }" - ) -} diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc28.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc28.ebuild deleted file mode 100644 index 1c3771a03676..000000000000 --- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc28.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -DESCRIPTION="The new generation of the pytest-salt Plugin" -HOMEPAGE=" - https://github.com/saltstack/pytest-salt-factories/ - https://pypi.org/project/pytest-salt-factories/ -" -SRC_URI=" - https://github.com/saltstack/pytest-salt-factories/archive/${PV//_/}.tar.gz - -> ${P}.gh.tar.gz -" -S=${WORKDIR}/${P//_/} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~riscv x86" - -RDEPEND=" - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/docker[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.0[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-skip-markers[${PYTHON_USEDEP}] - dev-python/pytest-system-statistics[${PYTHON_USEDEP}] - >=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}] - dev-python/pyzmq[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - >=app-admin/salt-3005.1[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-python/importlib-metadata[${PYTHON_USEDEP}] - dev-python/pyfakefs[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - -src_prepare() { - sed -i -e 's:helpers_namespace:pytest_&.plugin:' tests/conftest.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - tests/integration/factories/daemons/ssh/test_salt_ssh.py::test_salt_ssh - tests/integration/factories/daemons/sshd/test_sshd.py::test_connect - tests/scenarios/examples/test_echoext.py::test_echoext - ) - - local ret tempdir x - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" || die - addwrite "${tempdir}" - - local -x SHELL="/bin/bash" TMPDIR="${tempdir}" - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x PYTEST_PLUGINS=saltfactories.plugins - PYTEST_PLUGINS+=,pytest_helpers_namespace.plugin - PYTEST_PLUGINS+=,pytestsysstats.plugin - PYTEST_PLUGINS+=,pytest_subtests - for x in factories markers sysinfo event_listener log_server loader - do - PYTEST_PLUGINS+=,saltfactories.plugins.${x} - done - - nonfatal epytest --no-sys-stats - ret=${?} - - rm -rf "${tempdir}" || die - [[ ${ret} -ne 0 ]] && die "Tests failed with ${EPYTHON}" -}
