* [gentoo-commits] repo/gentoo:master commit in: dev-python/urwid/files/, dev-python/urwid/
@ 2020-03-07 15:03 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-03-07 15:03 UTC (permalink / raw
To: gentoo-commits
commit: 8e482f8f40da312ffe4347c6c507de90dc56fdf9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 7 15:00:52 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 7 15:00:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e482f8f
dev-python/urwid: Remove redundant versions
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/urwid/Manifest | 2 -
dev-python/urwid/files/urwid-1.1.0-sphinx.patch | 11 ----
.../urwid/files/urwid-1.3.1-test-vterm-EINTR.patch | 52 -------------------
dev-python/urwid/urwid-1.3.1.ebuild | 58 ----------------------
dev-python/urwid/urwid-2.0.1.ebuild | 49 ------------------
5 files changed, 172 deletions(-)
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index a1bd6c9227c..69ca17aa136 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1 @@
-DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed
-DIST urwid-2.0.1.tar.gz 604167 BLAKE2B 0c7c289175d023bb14fca2c48eeec9e149af301827874c17d3087532f19d120ca2208306db44c5fbfd28b68f4b192f176cd46b83e915a5cbb8200e442e69fedb SHA512 99c86a26b08c624c23207ce8e587e8442bece1f522e0c788600ad5f01a4c679efff95dd947edade8b6f4adc376edca949a40c305f9d5ddaf6a0ff97f13c6da30
DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
diff --git a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch
deleted file mode 100644
index 442aeea6750..00000000000
--- a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- urwid-1.1.0/docs/conf.py
-+++ urwid-1.1.0/docs/conf.py
-@@ -46,7 +46,7 @@
- # The version info for the project you're documenting, acts as replacement for
- # |version| and |release|, also used in various other places throughout the
- # built documents.
--FILE_PATH = os.path.dirname(__file__).decode('utf-8')
-+FILE_PATH = os.path.dirname(__file__)
- VERSION_MODULE = os.path.abspath(os.path.join(FILE_PATH,
- '../urwid/version.py'))
- VERSION_VARS = {}
diff --git a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
deleted file mode 100644
index 04b6e2c949c..00000000000
--- a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 3 Jun 2017 14:53:51 -0400
-Subject: [PATCH] test_vterm: handle EINTR when reading from pipe
-
-Fixes: https://github.com/urwid/urwid/issues/230
----
- urwid/tests/test_vterm.py | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py
-index 4dadfcc..075c653 100644
---- a/urwid/tests/test_vterm.py
-+++ b/urwid/tests/test_vterm.py
-@@ -18,6 +18,7 @@
- #
- # Urwid web site: http://excess.org/urwid/
-
-+import errno
- import os
- import sys
- import unittest
-@@ -28,7 +29,6 @@
- from urwid import signals
- from urwid.compat import B
-
--
- class DummyCommand(object):
- QUITSTRING = B('|||quit|||')
-
-@@ -41,12 +41,20 @@ def __call__(self):
- stdout.write(B('\x1bc'))
-
- while True:
-- data = os.read(self.reader, 1024)
-+ data = self.read(1024)
- if self.QUITSTRING == data:
- break
- stdout.write(data)
- stdout.flush()
-
-+ def read(self, size):
-+ while True:
-+ try:
-+ return os.read(self.reader, size)
-+ except OSError as e:
-+ if e.errno != errno.EINTR:
-+ raise
-+
- def write(self, data):
- os.write(self.writer, data)
-
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
deleted file mode 100644
index f0c427c9233..00000000000
--- a/dev-python/urwid/urwid-1.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.0-sphinx.patch"
- "${FILESDIR}/${PN}-1.3.1-test-vterm-EINTR.patch"
-)
-
-python_compile_all() {
- if use doc; then
- if python_is_python3; then
- 2to3 -nw --no-diffs docs/conf.py || die
- fi
- cd docs || die
- sphinx-build . _build/html || die
- fi
-}
-
-python_compile() {
- if ! python_is_python3; then
- local CFLAGS="${CFLAGS} -fno-strict-aliasing"
- export CFLAGS
- fi
-
- distutils-r1_python_compile
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/urwid/urwid-2.0.1.ebuild b/dev-python/urwid/urwid-2.0.1.ebuild
deleted file mode 100644
index 776c45b2f03..00000000000
--- a/dev-python/urwid/urwid-2.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
- if use doc; then
- sphinx-build docs _build/html || die
- fi
-}
-
-python_compile() {
- if ! python_is_python3; then
- local CFLAGS="${CFLAGS} -fno-strict-aliasing"
- export CFLAGS
- fi
-
- distutils-r1_python_compile
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- use doc && local HTML_DOCS=( _build/html/. )
-
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/urwid/files/, dev-python/urwid/
@ 2020-08-09 17:20 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-08-09 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 21f99a8b40c5e163571f491a516929781ece4433
Author: Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Sat Aug 8 16:16:49 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 17:20:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f99a8b
dev-python/urwid: Add version bump 2.1.1
Closes: https://bugs.gentoo.org/736412
Closes: https://bugs.gentoo.org/736410
Package-Manager: Portage-2.3.99, Repoman-2.3.2
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17059
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-python/urwid/Manifest | 1 +
...-2.1.1-ignore-resetting-to-invalid-locale.patch | 32 +++++++++++++++
dev-python/urwid/urwid-2.1.1.ebuild | 46 ++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 69ca17aa136..6a2e925fa78 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1 +1,2 @@
DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
+DIST urwid-2.1.1.tar.gz 633082 BLAKE2B 93393cc9f8e755cf2e25119f26487e062ab145ff4c966c69ad0b153cc2a286aac4f70be9b7e82c57f644fb850f70c88c0c9562cf1c07dcdd427e0afe409a01b0 SHA512 08fc51205f0adeea0ecce876ca17d921961b665894aef440fd826ef0f8b9230cd8d22c5db85fcf4e227f8e70841e3439860e5035ff874b8d0c1834111c3a97db
diff --git a/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch b/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch
new file mode 100644
index 00000000000..61549a50d08
--- /dev/null
+++ b/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch
@@ -0,0 +1,32 @@
+From fd010f8336407ad1a42522b424d2ea7b7800ebc4 Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Fri, 26 Jun 2020 22:26:23 +0200
+Subject: [PATCH] Ignore resetting to invalid locale (Closes: #377)
+
+Resetting the locale was introduced in 5dcf236, before that an invalid
+locale was ignored. Restore the old behavior insofar that only valid
+locales are restored.
+This fixes the unit tests of scottkosty/vit with unset LANG.
+---
+ urwid/util.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/urwid/util.py b/urwid/util.py
+index 17c049d..acd62f6 100644
+--- a/urwid/util.py
++++ b/urwid/util.py
+@@ -55,7 +55,10 @@ def detect_encoding():
+ else:
+ raise
+ finally:
+- locale.setlocale(locale.LC_ALL, initial)
++ try:
++ locale.setlocale(locale.LC_ALL, initial)
++ except locale.Error:
++ pass
+
+ if 'detected_encoding' not in locals():
+ detected_encoding = detect_encoding()
+--
+2.26.2
+
diff --git a/dev-python/urwid/urwid-2.1.1.ebuild b/dev-python/urwid/urwid-2.1.1.ebuild
new file mode 100644
index 00000000000..9103de23f2e
--- /dev/null
+++ b/dev-python/urwid/urwid-2.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/ https://github.com/urwid/urwid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.1-ignore-resetting-to-invalid-locale.patch"
+ )
+
+distutils_enable_sphinx docs
+distutils_enable_tests setup.py
+
+src_prepare() {
+ # optional tests broken by modern tornado versions
+ sed -e 's:import tornado:&_broken:' \
+ -i urwid/tests/test_event_loops.py || die
+ distutils-r1_src_prepare
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+
+ distutils-r1_python_compile
+}
+
+python_install_all() {
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/urwid/files/, dev-python/urwid/
@ 2021-12-02 19:58 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-12-02 19:58 UTC (permalink / raw
To: gentoo-commits
commit: d9e8880e801194abfc9e5358c39ccb7891689362
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 19:55:23 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 19:58:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e8880e
dev-python/urwid: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/urwid/Manifest | 1 -
...-2.1.1-ignore-resetting-to-invalid-locale.patch | 32 -----------------
dev-python/urwid/urwid-2.1.1.ebuild | 41 ----------------------
3 files changed, 74 deletions(-)
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 6e038e00a764..bd50588db114 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,2 +1 @@
-DIST urwid-2.1.1.tar.gz 633082 BLAKE2B 93393cc9f8e755cf2e25119f26487e062ab145ff4c966c69ad0b153cc2a286aac4f70be9b7e82c57f644fb850f70c88c0c9562cf1c07dcdd427e0afe409a01b0 SHA512 08fc51205f0adeea0ecce876ca17d921961b665894aef440fd826ef0f8b9230cd8d22c5db85fcf4e227f8e70841e3439860e5035ff874b8d0c1834111c3a97db
DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5
diff --git a/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch b/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch
deleted file mode 100644
index 61549a50d087..000000000000
--- a/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fd010f8336407ad1a42522b424d2ea7b7800ebc4 Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Fri, 26 Jun 2020 22:26:23 +0200
-Subject: [PATCH] Ignore resetting to invalid locale (Closes: #377)
-
-Resetting the locale was introduced in 5dcf236, before that an invalid
-locale was ignored. Restore the old behavior insofar that only valid
-locales are restored.
-This fixes the unit tests of scottkosty/vit with unset LANG.
----
- urwid/util.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/urwid/util.py b/urwid/util.py
-index 17c049d..acd62f6 100644
---- a/urwid/util.py
-+++ b/urwid/util.py
-@@ -55,7 +55,10 @@ def detect_encoding():
- else:
- raise
- finally:
-- locale.setlocale(locale.LC_ALL, initial)
-+ try:
-+ locale.setlocale(locale.LC_ALL, initial)
-+ except locale.Error:
-+ pass
-
- if 'detected_encoding' not in locals():
- detected_encoding = detect_encoding()
---
-2.26.2
-
diff --git a/dev-python/urwid/urwid-2.1.1.ebuild b/dev-python/urwid/urwid-2.1.1.ebuild
deleted file mode 100644
index b8cb039ea982..000000000000
--- a/dev-python/urwid/urwid-2.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/ https://github.com/urwid/urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.1.1-ignore-resetting-to-invalid-locale.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-src_prepare() {
- # optional tests broken by modern tornado versions
- sed -e 's:import tornado:&_broken:' \
- -i urwid/tests/test_event_loops.py || die
-
- # Fix doc generation
- sed -e 's/!defindex/layout/' -i docs/tools/templates/indexcontent.html || die
-
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/urwid/files/, dev-python/urwid/
@ 2023-01-27 15:47 Arthur Zamarin
0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2023-01-27 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 28ce4d68f16bd0961c95e0bfa1b0cedae084169d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 13:37:56 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 15:47:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ce4d68
dev-python/urwid: enable py3.11
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../urwid/files/urwid-2.1.2-fix-py3.11.patch | 26 ++++++++++++++++++++++
dev-python/urwid/urwid-2.1.2-r1.ebuild | 7 +++++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch b/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch
new file mode 100644
index 000000000000..dd60b8a220b9
--- /dev/null
+++ b/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch
@@ -0,0 +1,26 @@
+https://github.com/urwid/urwid/pull/517
+From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
+Date: Fri, 20 Jan 2023 11:37:15 -0800
+Subject: [PATCH] make tests compatible with Python 3.11
+
+--- a/urwid/tests/test_event_loops.py
++++ b/urwid/tests/test_event_loops.py
+@@ -201,15 +201,14 @@ def test_error(self):
+ evl.alarm(0.5, lambda: 1 / 0) # Simulate error in event loop
+ self.assertRaises(ZeroDivisionError, evl.run)
+
+- def test_coroutine_error(self):
++ async def test_coroutine_error(self):
+ evl = self.evl
+
+- @asyncio.coroutine
+- def error_coro():
++ async def error_coro():
+ result = 1 / 0 # Simulate error in coroutine
+ yield result
+
+- asyncio.ensure_future(error_coro())
++ asyncio.ensure_future(await error_coro())
+ self.assertRaises(ZeroDivisionError, evl.run)
+
+
diff --git a/dev-python/urwid/urwid-2.1.2-r1.ebuild b/dev-python/urwid/urwid-2.1.2-r1.ebuild
index 9914a472ab5f..b0934f8622e6 100644
--- a/dev-python/urwid/urwid-2.1.2-r1.ebuild
+++ b/dev-python/urwid/urwid-2.1.2-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="ncurses"
inherit distutils-r1 optfeature
@@ -24,6 +24,11 @@ IUSE="examples"
distutils_enable_sphinx docs
distutils_enable_tests setup.py
+PATCHES=(
+ # https://github.com/urwid/urwid/pull/517
+ "${FILESDIR}/${P}-fix-py3.11.patch"
+)
+
src_prepare() {
# optional tests broken by modern tornado versions
sed -e 's:import tornado:&_broken:' \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/urwid/files/, dev-python/urwid/
@ 2023-11-29 8:48 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-11-29 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 82dc173bdc679626aea9748ccd26a8bc4df20d23
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 08:45:23 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 08:45:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82dc173b
dev-python/urwid: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/urwid/Manifest | 1 -
.../urwid/files/urwid-2.1.2-fix-py3.11.patch | 26 -----------
dev-python/urwid/urwid-2.1.2-r1.ebuild | 54 ----------------------
3 files changed, 81 deletions(-)
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 19dc200b8d38..8795fe0eea38 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,2 +1 @@
-DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5
DIST urwid-2.2.3.tar.gz 677723 BLAKE2B 4aeae29e557e0ecbe902b56865feef3b2978263e657f2159194d8334852627ac6ccee82730d6a7e24b8914e5548ca88ac00eeddd7c2a34299d135843a99008fb SHA512 48588d0c819b229bdaaa70bec3a279c3bf232b8520d95e1f45a83bea927244634e91fd47cc161647c2d8155e523543549bc5ed2ccb5eac29843e12515e5dfd22
diff --git a/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch b/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch
deleted file mode 100644
index dd60b8a220b9..000000000000
--- a/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/urwid/urwid/pull/517
-From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
-Date: Fri, 20 Jan 2023 11:37:15 -0800
-Subject: [PATCH] make tests compatible with Python 3.11
-
---- a/urwid/tests/test_event_loops.py
-+++ b/urwid/tests/test_event_loops.py
-@@ -201,15 +201,14 @@ def test_error(self):
- evl.alarm(0.5, lambda: 1 / 0) # Simulate error in event loop
- self.assertRaises(ZeroDivisionError, evl.run)
-
-- def test_coroutine_error(self):
-+ async def test_coroutine_error(self):
- evl = self.evl
-
-- @asyncio.coroutine
-- def error_coro():
-+ async def error_coro():
- result = 1 / 0 # Simulate error in coroutine
- yield result
-
-- asyncio.ensure_future(error_coro())
-+ asyncio.ensure_future(await error_coro())
- self.assertRaises(ZeroDivisionError, evl.run)
-
-
diff --git a/dev-python/urwid/urwid-2.1.2-r1.ebuild b/dev-python/urwid/urwid-2.1.2-r1.ebuild
deleted file mode 100644
index 9e12ae1ba045..000000000000
--- a/dev-python/urwid/urwid-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="
- https://urwid.org/
- https://pypi.org/project/urwid/
- https://github.com/urwid/urwid/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-PATCHES=(
- # https://github.com/urwid/urwid/pull/517
- "${FILESDIR}/${P}-fix-py3.11.patch"
-)
-
-src_prepare() {
- # optional tests broken by modern tornado versions
- sed -e 's:import tornado:&_broken:' \
- -i urwid/tests/test_event_loops.py || die
-
- # Fix doc generation
- sed -e 's/!defindex/layout/' -i docs/tools/templates/indexcontent.html || die
-
- # Fix for >=dev-python/trio-0.15
- sed -e 's/hazmat/lowlevel/' -i urwid/_async_kw_event_loop.py || die
-
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Trio event loop" "dev-python/trio"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-29 8:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-02 19:58 [gentoo-commits] repo/gentoo:master commit in: dev-python/urwid/files/, dev-python/urwid/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-11-29 8:48 Michał Górny
2023-01-27 15:47 Arthur Zamarin
2020-08-09 17:20 Joonas Niilola
2020-03-07 15:03 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