* [gentoo-commits] repo/gentoo:master commit in: dev-python/k5test/, dev-python/k5test/files/
@ 2022-10-26 4:03 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-10-26 4:03 UTC (permalink / raw
To: gentoo-commits
commit: 1319bd8709d0dc7b3161c0c346eb935e03496f59
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 03:33:22 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 03:33:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1319bd87
dev-python/k5test: Patch out the dep on which(1)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/k5test/files/k5test-0.10.1-which.patch | 41 ++++++++++++++++++++++
...st-0.10.1-r1.ebuild => k5test-0.10.1-r2.ebuild} | 6 ++--
2 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/dev-python/k5test/files/k5test-0.10.1-which.patch b/dev-python/k5test/files/k5test-0.10.1-which.patch
new file mode 100644
index 000000000000..c5a72b5dc091
--- /dev/null
+++ b/dev-python/k5test/files/k5test-0.10.1-which.patch
@@ -0,0 +1,41 @@
+From cff2138124cb7461fe2b1a270d0c0132e6f66f6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 26 Oct 2022 05:31:22 +0200
+Subject: [PATCH] Use built-in shutil.which() instead of which(1) tool
+
+Use the built-in shutil.which() function that is available since Python
+3.3 instead of the external which(1) program. The latter is not part
+of POSIX and may be missing entirely (Gentoo is activately working
+towards removing it)>
+---
+ k5test/realm.py | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/k5test/realm.py b/k5test/realm.py
+index 8b24141..2260258 100644
+--- a/k5test/realm.py
++++ b/k5test/realm.py
+@@ -68,16 +68,13 @@ def _cfg_merge(cfg1, cfg2):
+
+
+ def _discover_path(name, default, paths):
+- stderr_out = subprocess.DEVNULL
+- try:
+- path = subprocess.check_output(["which", name], stderr=stderr_out).strip()
+- path = path.decode(sys.getfilesystemencoding() or sys.getdefaultencoding())
++ path = shutil.which(name)
++ if path is not None:
+ _LOG.debug(f"Using discovered path for {name} ({path})")
+- return path
+- except subprocess.CalledProcessError as e:
++ else:
+ path = paths.get(name, default)
+ _LOG.debug(f"Using default path for {name} ({path}): {e}")
+- return path
++ return path
+
+
+ class K5Realm(metaclass=abc.ABCMeta):
+--
+2.38.1
+
diff --git a/dev-python/k5test/k5test-0.10.1-r1.ebuild b/dev-python/k5test/k5test-0.10.1-r2.ebuild
similarity index 91%
rename from dev-python/k5test/k5test-0.10.1-r1.ebuild
rename to dev-python/k5test/k5test-0.10.1-r2.ebuild
index ea7af94b2982..aa48a24cd102 100644
--- a/dev-python/k5test/k5test-0.10.1-r1.ebuild
+++ b/dev-python/k5test/k5test-0.10.1-r2.ebuild
@@ -19,6 +19,6 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-RDEPEND="
- sys-apps/which
-"
+PATCHES=(
+ "${FILESDIR}"/${P}-which.patch
+)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/k5test/, dev-python/k5test/files/
@ 2022-11-29 8:48 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-11-29 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 510bcc8b043df12b8f3567026e6e4671dcb0dd3a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 08:42:05 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 08:48:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510bcc8b
dev-python/k5test: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/k5test/Manifest | 2 --
dev-python/k5test/files/k5test-0.10.1-which.patch | 41 -----------------------
dev-python/k5test/k5test-0.10.1-r2.ebuild | 24 -------------
dev-python/k5test/k5test-0.10.2.ebuild | 20 -----------
4 files changed, 87 deletions(-)
diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest
index 81ed129f2183..6376de936aa0 100644
--- a/dev-python/k5test/Manifest
+++ b/dev-python/k5test/Manifest
@@ -1,3 +1 @@
-DIST k5test-0.10.1.tar.gz 13664 BLAKE2B 4be24a8c9b154f5ec7b83b6743d0f756cb813bdfe4496c6f8ed873a2fc5a725c17b34f7b243d106d7a985aa53351f9bdc354fabba6a8c5fa3d25927513441cb4 SHA512 eaf451f0a932fdb8758f23e17ec52b2c1617074f186dddfba1d9c6844291fb2f4b003e05f4a0e02ce1bae37ee4251ea8295d2ebc8d9002c83d3179000fa4785e
-DIST k5test-0.10.2.tar.gz 13579 BLAKE2B 74ee10525a091bb67685ee765e74542f87935843f2693d579907f6f95f2fbd1b9ad1e485e5360d1b3c7ac6cdb7fce4b1515b93eba99008c43c857c6133d7d7f2 SHA512 4f01297179a8ededcde7d2f4128fe68a48567fff5cffd6e8f8fc1e8e0717acd5c6a05b7b5944baf5189bb58e67eaa553ca014d00e53ccdc834dca364d460520f
DIST k5test-0.10.3.tar.gz 13580 BLAKE2B dd2775494de32b3eec92d387a2c907a82c4858c169f286152eb79ea16c5ad1e89b21df840a727df07e879583f6e3006687e339f876456be5628134fa2fdefea3 SHA512 8c07677fbed5189d4ef905d6b201470871eab96700318194527514e7d841a8ec2c28c4f5139dbb2d7fe9be0db4046656d0b3f69ace86c1bbbd3886096adb5792
diff --git a/dev-python/k5test/files/k5test-0.10.1-which.patch b/dev-python/k5test/files/k5test-0.10.1-which.patch
deleted file mode 100644
index c5a72b5dc091..000000000000
--- a/dev-python/k5test/files/k5test-0.10.1-which.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cff2138124cb7461fe2b1a270d0c0132e6f66f6b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 26 Oct 2022 05:31:22 +0200
-Subject: [PATCH] Use built-in shutil.which() instead of which(1) tool
-
-Use the built-in shutil.which() function that is available since Python
-3.3 instead of the external which(1) program. The latter is not part
-of POSIX and may be missing entirely (Gentoo is activately working
-towards removing it)>
----
- k5test/realm.py | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/k5test/realm.py b/k5test/realm.py
-index 8b24141..2260258 100644
---- a/k5test/realm.py
-+++ b/k5test/realm.py
-@@ -68,16 +68,13 @@ def _cfg_merge(cfg1, cfg2):
-
-
- def _discover_path(name, default, paths):
-- stderr_out = subprocess.DEVNULL
-- try:
-- path = subprocess.check_output(["which", name], stderr=stderr_out).strip()
-- path = path.decode(sys.getfilesystemencoding() or sys.getdefaultencoding())
-+ path = shutil.which(name)
-+ if path is not None:
- _LOG.debug(f"Using discovered path for {name} ({path})")
-- return path
-- except subprocess.CalledProcessError as e:
-+ else:
- path = paths.get(name, default)
- _LOG.debug(f"Using default path for {name} ({path}): {e}")
-- return path
-+ return path
-
-
- class K5Realm(metaclass=abc.ABCMeta):
---
-2.38.1
-
diff --git a/dev-python/k5test/k5test-0.10.1-r2.ebuild b/dev-python/k5test/k5test-0.10.1-r2.ebuild
deleted file mode 100644
index aa48a24cd102..000000000000
--- a/dev-python/k5test/k5test-0.10.1-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
-HOMEPAGE="
- https://github.com/pythongssapi/k5test/
- https://pypi.org/project/k5test/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-PATCHES=(
- "${FILESDIR}"/${P}-which.patch
-)
diff --git a/dev-python/k5test/k5test-0.10.2.ebuild b/dev-python/k5test/k5test-0.10.2.ebuild
deleted file mode 100644
index c8ee7bd62dd7..000000000000
--- a/dev-python/k5test/k5test-0.10.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
-HOMEPAGE="
- https://github.com/pythongssapi/k5test/
- https://pypi.org/project/k5test/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-29 8:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-26 4:03 [gentoo-commits] repo/gentoo:master commit in: dev-python/k5test/, dev-python/k5test/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-11-29 8:48 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox