1 |
commit: c188ba0d3efb81b4708dc5baf19b9bfbcb6248cf |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 30 05:47:59 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 30 06:02:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c188ba0d |
7 |
|
8 |
dev-python/terminaltables: Port to py3.9, fix tests |
9 |
|
10 |
Closes: https://bugs.gentoo.org/723590 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
.../files/terminaltables-3.1.0-stdout.patch | 23 ++++++++++++++++++++++ |
14 |
.../terminaltables/terminaltables-3.1.0.ebuild | 19 +++++++++--------- |
15 |
.../terminaltables/terminaltables-9999.ebuild | 10 +++------- |
16 |
3 files changed, 36 insertions(+), 16 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/terminaltables/files/terminaltables-3.1.0-stdout.patch b/dev-python/terminaltables/files/terminaltables-3.1.0-stdout.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..e463ff66f93 |
21 |
--- /dev/null |
22 |
+++ b/dev-python/terminaltables/files/terminaltables-3.1.0-stdout.patch |
23 |
@@ -0,0 +1,23 @@ |
24 |
+From 9cb9d0ef11fac861e46776fb18cef309df28c234 Mon Sep 17 00:00:00 2001 |
25 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
26 |
+Date: Thu, 30 Jul 2020 07:59:05 +0200 |
27 |
+Subject: [PATCH] Fix writing binary data to sys.stdout |
28 |
+ |
29 |
+--- |
30 |
+ terminaltables/terminal_io.py | 2 +- |
31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
+ |
33 |
+diff --git a/terminaltables/terminal_io.py b/terminaltables/terminal_io.py |
34 |
+index 8b8c10d..310263c 100644 |
35 |
+--- a/terminaltables/terminal_io.py |
36 |
++++ b/terminaltables/terminal_io.py |
37 |
+@@ -94,5 +94,5 @@ def set_terminal_title(title, kernel32=None): |
38 |
+ return kernel32.SetConsoleTitleW(title) != 0 |
39 |
+ |
40 |
+ # Linux/OSX. |
41 |
+- sys.stdout.write(b'\033]0;' + title_bytes + b'\007') |
42 |
++ sys.stdout.buffer.write(b'\033]0;' + title_bytes + b'\007') |
43 |
+ return True |
44 |
+-- |
45 |
+2.28.0 |
46 |
+ |
47 |
|
48 |
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild |
49 |
index 384bf33858e..86d74c67298 100644 |
50 |
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild |
51 |
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild |
52 |
@@ -3,27 +3,28 @@ |
53 |
|
54 |
EAPI=7 |
55 |
|
56 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
57 |
+PYTHON_COMPAT=( python3_{6..9} ) |
58 |
inherit distutils-r1 |
59 |
|
60 |
DESCRIPTION="Generate simple tables in terminals from a nested list of strings" |
61 |
HOMEPAGE="https://robpol86.github.io/terminaltables" |
62 |
-SRC_URI="https://github.com/Robpol86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
63 |
+SRC_URI=" |
64 |
+ https://github.com/Robpol86/terminaltables/archive/v${PV}.tar.gz |
65 |
+ -> ${P}.tar.gz" |
66 |
|
67 |
LICENSE="MIT" |
68 |
SLOT="0" |
69 |
KEYWORDS="~amd64 ~x86" |
70 |
-IUSE="test" |
71 |
-RESTRICT="!test? ( test )" |
72 |
|
73 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
74 |
+BDEPEND=" |
75 |
test? ( |
76 |
dev-python/colorama[${PYTHON_USEDEP}] |
77 |
dev-python/colorclass[${PYTHON_USEDEP}] |
78 |
- dev-python/pytest[${PYTHON_USEDEP}] |
79 |
dev-python/termcolor[${PYTHON_USEDEP}] |
80 |
)" |
81 |
|
82 |
-python_test() { |
83 |
- pytest -vv || die "Tests fail with ${EPYTHON}" |
84 |
-} |
85 |
+distutils_enable_tests pytest |
86 |
+ |
87 |
+PATCHES=( |
88 |
+ "${FILESDIR}"/terminaltables-3.1.0-stdout.patch |
89 |
+) |
90 |
|
91 |
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild |
92 |
index a855b1d99da..7bacaa3fb7c 100644 |
93 |
--- a/dev-python/terminaltables/terminaltables-9999.ebuild |
94 |
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild |
95 |
@@ -3,7 +3,7 @@ |
96 |
|
97 |
EAPI=7 |
98 |
|
99 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
100 |
+PYTHON_COMPAT=( python3_{6..9} ) |
101 |
EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git" |
102 |
inherit distutils-r1 git-r3 |
103 |
|
104 |
@@ -14,10 +14,8 @@ SRC_URI="" |
105 |
LICENSE="MIT" |
106 |
SLOT="0" |
107 |
KEYWORDS="" |
108 |
-IUSE="test" |
109 |
-RESTRICT="!test? ( test )" |
110 |
|
111 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
112 |
+BDEPEND=" |
113 |
test? ( |
114 |
dev-python/colorama[${PYTHON_USEDEP}] |
115 |
dev-python/colorclass[${PYTHON_USEDEP}] |
116 |
@@ -25,6 +23,4 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
117 |
dev-python/termcolor[${PYTHON_USEDEP}] |
118 |
)" |
119 |
|
120 |
-python_test() { |
121 |
- pytest -vv || die "Tests fail with ${EPYTHON}" |
122 |
-} |
123 |
+distutils_enable_tests pytest |