* [gentoo-commits] repo/gentoo:master commit in: dev-python/cmd2/files/, dev-python/cmd2/
@ 2022-05-21 13:49 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-05-21 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 6fc9bf39382407a485ddc3732a28587dc64de04e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 13:45:29 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 21 13:49:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc9bf39
dev-python/cmd2: Enable py3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/cmd2/cmd2-2.4.1.ebuild | 11 +++++++++--
dev-python/cmd2/files/cmd2-2.4.1-py311.patch | 26 ++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
index b3c095fe347b..3ffe96f16981 100644
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.1.ebuild
@@ -4,12 +4,15 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 virtualx
DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
+HOMEPAGE="
+ https://github.com/python-cmd2/cmd2/
+ https://pypi.org/project/cmd2/
+"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
@@ -42,6 +45,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-py311.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
sed -i -e '/--cov/d' setup.cfg || die
diff --git a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
new file mode 100644
index 000000000000..c0e9da528a08
--- /dev/null
+++ b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
@@ -0,0 +1,26 @@
+From c02bb7dce587886fe380704a8c6a6009eb677a74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 21 May 2022 15:41:11 +0200
+Subject: [PATCH] Fixed duplicate subparser name in
+ test_add_parser_custom_completer
+
+If I'm not mistaken, the use of the same name for both subparsers was
+not intentional but a typo. In Python 3.11, this is an error and causes
+the test to fail.
+
+Fixes #1228
+---
+ tests/test_argparse_completer.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_argparse_completer.py b/tests/test_argparse_completer.py
+index 135d3de4..14c8c1de 100644
+--- a/tests/test_argparse_completer.py
++++ b/tests/test_argparse_completer.py
+@@ -1371,5 +1371,5 @@ def test_add_parser_custom_completer():
+ no_custom_completer_parser = subparsers.add_parser(name="no_custom_completer")
+ assert no_custom_completer_parser.get_ap_completer_type() is None # type: ignore[attr-defined]
+
+- custom_completer_parser = subparsers.add_parser(name="no_custom_completer", ap_completer_type=CustomCompleter)
++ custom_completer_parser = subparsers.add_parser(name="custom_completer", ap_completer_type=CustomCompleter)
+ assert custom_completer_parser.get_ap_completer_type() is CustomCompleter # type: ignore[attr-defined]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/cmd2/files/, dev-python/cmd2/
@ 2022-08-13 12:35 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-08-13 12:35 UTC (permalink / raw
To: gentoo-commits
commit: d1b1f4887c48cdd8eb3d873854f4497ae3db5bbb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 12:35:27 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 12:35:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b1f488
dev-python/cmd2: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/cmd2/Manifest | 1 -
dev-python/cmd2/cmd2-2.4.1.ebuild | 64 ----------------------------
dev-python/cmd2/files/cmd2-2.4.1-py311.patch | 26 -----------
3 files changed, 91 deletions(-)
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 3edbbc44a97c..50e96a260ae0 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,2 +1 @@
-DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
DIST cmd2-2.4.2.tar.gz 677598 BLAKE2B 38b767e70d42125639578a906a6bd0ac737ee1e3be2951b122f91a1a2bfe366ea23db2d7d7350842b667aca7614a3520057f689cb1c253d1c4b11e164c2ee4a1 SHA512 d70d264671db2783526c589199ff74cc70d53a4fbaa1d78636a508dbf8216aefab17f5764bf25b2b86e9c1413e0e61977819fbb0dec59d3209195df522d3fa5f
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
deleted file mode 100644
index d14b273ef06b..000000000000
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-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 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="
- https://github.com/python-cmd2/cmd2/
- https://pypi.org/project/cmd2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-python/attrs[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
- >=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures. to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel).
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- || (
- x11-misc/xclip
- x11-misc/xsel
- )
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-py311.patch
-)
-
-src_prepare() {
- distutils-r1_src_prepare
- sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
- # tests rely on very specific text wrapping...
- local -x COLUMNS=80
- virtx distutils-r1_src_test
-}
-
-python_test() {
- epytest -p no:pytest-qt || die
-}
diff --git a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
deleted file mode 100644
index c0e9da528a08..000000000000
--- a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c02bb7dce587886fe380704a8c6a6009eb677a74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 May 2022 15:41:11 +0200
-Subject: [PATCH] Fixed duplicate subparser name in
- test_add_parser_custom_completer
-
-If I'm not mistaken, the use of the same name for both subparsers was
-not intentional but a typo. In Python 3.11, this is an error and causes
-the test to fail.
-
-Fixes #1228
----
- tests/test_argparse_completer.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_argparse_completer.py b/tests/test_argparse_completer.py
-index 135d3de4..14c8c1de 100644
---- a/tests/test_argparse_completer.py
-+++ b/tests/test_argparse_completer.py
-@@ -1371,5 +1371,5 @@ def test_add_parser_custom_completer():
- no_custom_completer_parser = subparsers.add_parser(name="no_custom_completer")
- assert no_custom_completer_parser.get_ap_completer_type() is None # type: ignore[attr-defined]
-
-- custom_completer_parser = subparsers.add_parser(name="no_custom_completer", ap_completer_type=CustomCompleter)
-+ custom_completer_parser = subparsers.add_parser(name="custom_completer", ap_completer_type=CustomCompleter)
- assert custom_completer_parser.get_ap_completer_type() is CustomCompleter # type: ignore[attr-defined]
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-13 12:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-13 12:35 [gentoo-commits] repo/gentoo:master commit in: dev-python/cmd2/files/, dev-python/cmd2/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-05-21 13:49 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