Gentoo Archives: gentoo-commits

From: Aaron Swenson <titanofold@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/mako/files/, dev-python/mako/
Date: Sat, 03 Jun 2017 21:06:12
Message-Id: 1496523950.55e0ea0547613a8d3586859557c45580ae4fd1ad.titanofold@gentoo
1 commit: 55e0ea0547613a8d3586859557c45580ae4fd1ad
2 Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 3 21:04:51 2017 +0000
4 Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 3 21:05:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e0ea05
7
8 dev-python/mako: Version bump
9
10 Bump version to 1.0.6. Add patch to correct test failure regarding
11 Pygment (Bug 577128).
12
13 Bug: https://bugs.gentoo.org/577128
14
15 Package-Manager: Portage-2.3.5, Repoman-2.3.1
16
17 dev-python/mako/Manifest | 1 +
18 dev-python/mako/files/pygments-exception.patch | 32 +++++++++++++++
19 dev-python/mako/mako-1.0.6.ebuild | 56 ++++++++++++++++++++++++++
20 3 files changed, 89 insertions(+)
21
22 diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
23 index b2c11b175f5..0afe01bbc9a 100644
24 --- a/dev-python/mako/Manifest
25 +++ b/dev-python/mako/Manifest
26 @@ -1,2 +1,3 @@
27 DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
28 DIST Mako-1.0.3.tar.gz 565224 SHA256 7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d WHIRLPOOL 4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583
29 +DIST Mako-1.0.6.tar.gz 575112 SHA256 48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf WHIRLPOOL dd0c12f2b8fe6f65907df662de73117eb11afee015f3acd2c70c8522456a7c52761a1bfe8247ce9e88a4ca704008a120be95893f3c3b1b0e410c1a244af011ba
30
31 diff --git a/dev-python/mako/files/pygments-exception.patch b/dev-python/mako/files/pygments-exception.patch
32 new file mode 100644
33 index 00000000000..0d2faca4f68
34 --- /dev/null
35 +++ b/dev-python/mako/files/pygments-exception.patch
36 @@ -0,0 +1,32 @@
37 +From 8eaf6b7ea92018202a886e1d919e2c6b0d307c99 Mon Sep 17 00:00:00 2001
38 +From: Mike Bayer <mike_mp@××××××××××××.com>
39 +Date: Mon, 22 May 2017 22:30:54 -0400
40 +Subject: [PATCH] - exception test fixes for more recent pygments
41 +
42 +Change-Id: Ibdfe5b2f2f3d1426921bcadf6740ae065ed0833b
43 +---
44 + test/test_exceptions.py | 4 ++--
45 + 1 file changed, 2 insertions(+), 2 deletions(-)
46 +
47 +diff --git a/test/test_exceptions.py b/test/test_exceptions.py
48 +index 8321b25..bcaae3b 100644
49 +--- a/test/test_exceptions.py
50 ++++ b/test/test_exceptions.py
51 +@@ -91,7 +91,7 @@ def test_utf8_html_error_template_pygments(self):
52 + assert "".encode(sys.getdefaultencoding(),
53 + 'htmlentityreplace') in html_error
54 + else:
55 +- assert 'u&#39;'\
56 ++ assert '&#39;'\
57 + '&#x43F;&#x440;&#x438;&#x432;&#x435;&#x442;'\
58 + '&#39;</span><span class="cp">}</span>'.encode(
59 + sys.getdefaultencoding(),
60 +@@ -220,7 +220,7 @@ def test_utf8_format_exceptions_pygments(self):
61 + assert '&#39;привет&#39;</span>' in \
62 + l.get_template("foo.html").render().decode('utf-8')
63 + else:
64 +- assert 'u&#39;&#x43F;&#x440;&#x438;&#x432;'\
65 ++ assert '&#39;&#x43F;&#x440;&#x438;&#x432;'\
66 + '&#x435;&#x442;&#39;</span>' in \
67 + l.get_template("foo.html").render().decode('utf-8')
68 +
69
70 diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
71 new file mode 100644
72 index 00000000000..2cc45b62337
73 --- /dev/null
74 +++ b/dev-python/mako/mako-1.0.6.ebuild
75 @@ -0,0 +1,56 @@
76 +# Copyright 1999-2017 Gentoo Foundation
77 +# Distributed under the terms of the GNU General Public License v2
78 +
79 +EAPI=6
80 +
81 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
82 +
83 +inherit distutils-r1 eutils versionator
84 +
85 +MY_PN="Mako"
86 +MY_P=${MY_PN}-${PV}
87 +
88 +DESCRIPTION="A Python templating language"
89 +HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
90 +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
91 +
92 +LICENSE="MIT"
93 +SLOT="0"
94 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
95 +IUSE="doc test"
96 +
97 +RDEPEND="
98 + >=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
99 +DEPEND="${RDEPEND}
100 + dev-python/setuptools[${PYTHON_USEDEP}]
101 + test? (
102 + dev-python/nose[${PYTHON_USEDEP}]
103 + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
104 + )"
105 +
106 +S="${WORKDIR}/${MY_P}"
107 +PATCHES=( "${FILESDIR}/pygments-exception.patch" )
108 +
109 +python_test() {
110 + nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
111 +}
112 +
113 +python_install_all() {
114 + rm -rf doc/build || die
115 +
116 + use doc && local HTML_DOCS=( doc/. )
117 + distutils-r1_python_install_all
118 +}
119 +
120 +pkg_postinst() {
121 + optfeature "Caching support" dev-python/beaker
122 + for v in ${REPLACING_VERSIONS}; do
123 + if ! version_is_at_least 0.7.3-r2 $v; then
124 + ewarn "dev-python/beaker is no longer hard dependency of ${P}"
125 + ewarn "If you rely on it, you should add beaker to your world"
126 + ewarn "file:"
127 + ewarn "# emerge --noreplace beaker"
128 + break
129 + fi
130 + done
131 +}