From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD13915801B for ; Tue, 15 Aug 2023 19:47:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC5442BC02A; Tue, 15 Aug 2023 19:47:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF5B82BC02A for ; Tue, 15 Aug 2023 19:47:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BEC534090F for ; Tue, 15 Aug 2023 19:47:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 994C2B8B for ; Tue, 15 Aug 2023 19:47:39 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1692128855.d7fa918e3b8de4336d6db8cdfa5b22a5a28dfb45.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-system-statistics/files/, dev-python/pytest-system-statistics/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pytest-system-statistics/files/pytest-system-statistics-1.0.2-loader.patch dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild X-VCS-Directories: dev-python/pytest-system-statistics/ dev-python/pytest-system-statistics/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: d7fa918e3b8de4336d6db8cdfa5b22a5a28dfb45 X-VCS-Branch: master Date: Tue, 15 Aug 2023 19:47:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: df967ed9-3d00-489d-ba1a-bc6f8708554a X-Archives-Hash: 43197788d00e1efbca46e068068ce282 commit: d7fa918e3b8de4336d6db8cdfa5b22a5a28dfb45 Author: Patrick McLean gentoo org> AuthorDate: Tue Aug 15 02:57:56 2023 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Aug 15 19:47:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fa918e dev-python/pytest-system-statistics: Revbump, add fix for loading with newer setuptools Signed-off-by: Patrick McLean gentoo.org> .../pytest-system-statistics-1.0.2-loader.patch | 43 ++++++++++++++++ .../pytest-system-statistics-1.0.2-r2.ebuild | 57 ++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dev-python/pytest-system-statistics/files/pytest-system-statistics-1.0.2-loader.patch b/dev-python/pytest-system-statistics/files/pytest-system-statistics-1.0.2-loader.patch new file mode 100644 index 000000000000..6d4751759617 --- /dev/null +++ b/dev-python/pytest-system-statistics/files/pytest-system-statistics-1.0.2-loader.patch @@ -0,0 +1,43 @@ +diff --git a/src/pytestsysstats/plugin.py b/src/pytestsysstats/plugin.py +index 4009858..3067f73 100644 +--- a/src/pytestsysstats/plugin.py ++++ b/src/pytestsysstats/plugin.py +@@ -231,20 +231,17 @@ def pytest_sessionstart(session: "Session") -> None: + ): + stats_processes_instance = StatsProcesses() + stats_processes_instance.add("Test Suite Run", os.getpid()) +- else: +- stats_processes_instance = None ++ session.config.pluginmanager.register(stats_processes_instance, "sysstats-processes") + +- session.config.pluginmanager.register(stats_processes_instance, "sysstats-processes") +- +- terminalreporter = session.config.pluginmanager.getplugin( +- "terminalreporter" +- ) # type: "TerminalReporter" +- sys_stats_reporter = SystemStatsReporter( +- config=session.config, +- stats_processes=stats_processes_instance, +- terminalreporter=terminalreporter, +- ) +- session.config.pluginmanager.register(sys_stats_reporter, "sysstats-reporter") ++ terminalreporter = session.config.pluginmanager.getplugin( ++ "terminalreporter" ++ ) # type: "TerminalReporter" ++ sys_stats_reporter = SystemStatsReporter( ++ config=session.config, ++ stats_processes=stats_processes_instance, ++ terminalreporter=terminalreporter, ++ ) ++ session.config.pluginmanager.register(sys_stats_reporter, "sysstats-reporter") + + + @pytest.fixture(scope="session") # type: ignore[misc] +@@ -252,5 +249,5 @@ def stats_processes(request: "SubRequest") -> StatsProcesses: + """ + Session scoped process statistics tracker. + """ +- plugin = request.config.pluginmanager.get_plugin("sysstats-processes") # type: StatsProcesses +- return plugin ++ if request.config.pluginmanager.has_plugin("sysstats-processes"): ++ return request.config.pluginmanager.get_plugin("sysstats-processes") # type: StatsProcesses diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild new file mode 100644 index 000000000000..1b51073f1fb6 --- /dev/null +++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 + +DESCRIPTION="Pytest Plugin Which Reports System Usage Statistics" +HOMEPAGE=" + https://pypi.org/project/pytest-system-statistics/ + https://github.com/saltstack/pytest-system-statistics +" +SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + >=dev-python/pytest-6.0.0[${PYTHON_USEDEP}] + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/wheel[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-subtests[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/pytest-system-statistics-1.0.2-loader.patch" +) + +distutils_enable_tests pytest + +python_prepare_all() { + sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die + sed -e "/setuptools_scm/ d" -i setup.cfg || die + sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die + + printf '__version__ = "${PV}"\n' > src/pytestsysstats/version.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + local EPYTEST_DESELECT=( + tests/functional/test_syststats.py::test_proc_sys_stats + tests/functional/test_syststats.py::test_proc_sys_stats_no_children + ) + epytest +}