[gentoo-commits] repo/gentoo:master commit in: app-misc/liquidctl/, app-misc/liquidctl/files/

[gentoo-commits] repo/gentoo:master commit in: app-misc/liquidctl/, app-misc/liquidctl/files/

[Rick Farina]

commit:     f47fa22bdc6b6fe8e134cd72f26654038d1ad4dd
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 12:51:58 2024 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 12:52:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47fa22b

app-misc/liquidctl: fix some test failures

Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-misc/liquidctl/files/709.patch         | 32 ++++++++++++++++++++++++++++++
 app-misc/liquidctl/liquidctl-1.13.0.ebuild |  3 +++
 2 files changed, 35 insertions(+)

diff --git a/app-misc/liquidctl/files/709.patch b/app-misc/liquidctl/files/709.patch
new file mode 100644
index 000000000000..dd0d6420a9da
--- /dev/null
+++ b/app-misc/liquidctl/files/709.patch
@@ -0,0 +1,32 @@
+From 470b159fddbf595ccbf6995b4f9e6a1462e97c65 Mon Sep 17 00:00:00 2001
+From: Jonas Malaco <jonas@protocubo.io>
+Date: Tue, 21 May 2024 15:53:40 -0300
+Subject: [PATCH] test_cli: don't change the type of sys.argv when
+ monkeypatching it
+
+When setting up for the CLI tests, we inadvertently change the type of
+sys.argv from list to tuple. That worked with OG docopt, but breaks
+docopt-ng. More importantly, the Python docs say sys.argv is a _list_.
+
+So even though docopt was able to handle it being a tuple, and docopt-ng
+seems (from a cursory look at its source) to still handle it being a
+string, let's use the correct type.
+
+Fixes: #708
+---
+ tests/test_cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index aa577ffc0..76791e896 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -11,7 +11,7 @@
+ def main(monkeypatch, capsys):
+     """Return a function f(*args) to run main with `args` as `sys.argv`."""
+     def call_with_args(*args):
+-        monkeypatch.setattr(sys, 'argv', args)
++        monkeypatch.setattr(sys, 'argv', list(args))
+         try:
+             liquidctl.cli.main()
+         except SystemExit as exit:

diff --git a/app-misc/liquidctl/liquidctl-1.13.0.ebuild b/app-misc/liquidctl/liquidctl-1.13.0.ebuild
index a2eb2e0132a7..6cec41aae631 100644
--- a/app-misc/liquidctl/liquidctl-1.13.0.ebuild
+++ b/app-misc/liquidctl/liquidctl-1.13.0.ebuild
@@ -28,6 +28,9 @@ BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
+# This is a merged PR, remove it on bump
+PATCHES=( "${FILESDIR}/709.patch" )
+
 distutils_enable_tests pytest
 
 src_test() {

[gentoo-commits] repo/gentoo:master commit in: app-misc/liquidctl/, app-misc/liquidctl/files/

[Petr Vaněk]

commit:     86db514ec6a849b9e18d89ff05d20c1b5c96658f
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 19 08:36:50 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Mar 19 08:39:05 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86db514e

app-misc/liquidctl: drop 1.13.0

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 app-misc/liquidctl/Manifest                |  1 -
 app-misc/liquidctl/files/709.patch         | 32 -----------------
 app-misc/liquidctl/liquidctl-1.13.0.ebuild | 56 ------------------------------
 3 files changed, 89 deletions(-)

diff --git a/app-misc/liquidctl/Manifest b/app-misc/liquidctl/Manifest
index cfe29cd0d856..0394cb240d9a 100644
--- a/app-misc/liquidctl/Manifest
+++ b/app-misc/liquidctl/Manifest
@@ -1,2 +1 @@
-DIST liquidctl-1.13.0.tar.gz 1844095 BLAKE2B 066fe154fc8ea55a1163bcf5403cf4602c10bcd4b24c3a808dc11d9324bb41395b685856e546d8ea10f3e464e5cf20e45b8f98a46cc388052130f4e9e3537bf4 SHA512 12a7fe58e35367684efa4f6db68bcd09aa2f485bfc52b50136013c9275a1295bc9bc1e0d3c940097b0b3154c1d24a1792e6a894395a6826a27f9e6ea6a8e3893
 DIST liquidctl-1.14.0.tar.gz 1876711 BLAKE2B d151ca7c2d59e117515772041e34f34e28999845a6a9e12c3a940c8e2431d5d38b809c1e8af65c6447c548e6051c4808bebb10b4132d444ea1cb7cf5ca3c90a7 SHA512 a27fd0ee1a9a4b08298ba0ddb862c0adedf1b2be64d8fa49a6dcb8a32aaffb70c9de6e324efe2626d50e070d33cd54985e581f25de254118f218f46716d0e938

diff --git a/app-misc/liquidctl/files/709.patch b/app-misc/liquidctl/files/709.patch
deleted file mode 100644
index dd0d6420a9da..000000000000
--- a/app-misc/liquidctl/files/709.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 470b159fddbf595ccbf6995b4f9e6a1462e97c65 Mon Sep 17 00:00:00 2001
-From: Jonas Malaco <jonas@protocubo.io>
-Date: Tue, 21 May 2024 15:53:40 -0300
-Subject: [PATCH] test_cli: don't change the type of sys.argv when
- monkeypatching it
-
-When setting up for the CLI tests, we inadvertently change the type of
-sys.argv from list to tuple. That worked with OG docopt, but breaks
-docopt-ng. More importantly, the Python docs say sys.argv is a _list_.
-
-So even though docopt was able to handle it being a tuple, and docopt-ng
-seems (from a cursory look at its source) to still handle it being a
-string, let's use the correct type.
-
-Fixes: #708
----
- tests/test_cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index aa577ffc0..76791e896 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -11,7 +11,7 @@
- def main(monkeypatch, capsys):
-     """Return a function f(*args) to run main with `args` as `sys.argv`."""
-     def call_with_args(*args):
--        monkeypatch.setattr(sys, 'argv', args)
-+        monkeypatch.setattr(sys, 'argv', list(args))
-         try:
-             liquidctl.cli.main()
-         except SystemExit as exit:

diff --git a/app-misc/liquidctl/liquidctl-1.13.0.ebuild b/app-misc/liquidctl/liquidctl-1.13.0.ebuild
deleted file mode 100644
index 6cec41aae631..000000000000
--- a/app-misc/liquidctl/liquidctl-1.13.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 udev
-
-DESCRIPTION="Cross-platform tool and drivers for liquid coolers and other devices"
-HOMEPAGE="https://github.com/liquidctl/liquidctl"
-SRC_URI="https://github.com/liquidctl/liquidctl/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/crcmod[${PYTHON_USEDEP}]
-	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/hidapi[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	sys-apps/i2c-tools[${PYTHON_USEDEP},python]
-"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-# This is a merged PR, remove it on bump
-PATCHES=( "${FILESDIR}/709.patch" )
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Without this variable, it attempts to write to /var/run and fails
-	XDG_RUNTIME_DIR="${T}/xdg" distutils-r1_src_test || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc docs/*.md
-	dodoc -r docs/linux/
-
-	udev_dorules extra/linux/71-liquidctl.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}