[gentoo-commits] repo/gentoo:master commit in: dev-python/mako/files/, dev-python/mako/
commit: 29e2cb4c6c03c8133ce1b57ec6435583dac73c13
Author: Michał Górny gentoo org>
AuthorDate: Mon Mar 2 06:37:52 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Mar 2 06:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e2cb4c
dev-python/mako: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/mako/Manifest | 2 -
dev-python/mako/files/pygments-exception.patch | 32 --
dev-python/mako/mako-1.0.3.ebuild | 56
dev-python/mako/mako-1.0.6.ebuild | 59 --
4 files changed, 149 deletions(-)
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index f5fc23fd761..caaf8f9bdc8 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,5 +1,3 @@
-DIST Mako-1.0.3.tar.gz 565224 BLAKE2B
8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29
SHA512
1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
-DIST Mako-1.0.6.tar.gz 575112 BLAKE2B
c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5
SHA512
15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
DIST Mako-1.0.7.tar.gz 564418 BLAKE2B
c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961
SHA512
d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
DIST Mako-1.1.0.tar.gz 463945 BLAKE2B
31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549
SHA512
acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
DIST Mako-1.1.1.tar.gz 468894 BLAKE2B
f6ef4f67e369c6d2078b0a7534a765aa254afcf7c373b5d3f8fcac05336b9a46d8391398e4b287fa0826bc03cdbea3361c5225c5e5bcc966f88adb089ff3a5be
SHA512
ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7
diff --git a/dev-python/mako/files/pygments-exception.patch
b/dev-python/mako/files/pygments-exception.patch
deleted file mode 100644
index 0d2faca4f68..000
--- a/dev-python/mako/files/pygments-exception.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8eaf6b7ea92018202a886e1d919e2c6b0d307c99 Mon Sep 17 00:00:00 2001
-From: Mike Bayer
-Date: Mon, 22 May 2017 22:30:54 -0400
-Subject: [PATCH] - exception test fixes for more recent pygments
-
-Change-Id: Ibdfe5b2f2f3d1426921bcadf6740ae065ed0833b
- test/test_exceptions.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_exceptions.py b/test/test_exceptions.py
-index 8321b25..bcaae3b 100644
a/test/test_exceptions.py
-+++ b/test/test_exceptions.py
-@@ -91,7 +91,7 @@ def test_utf8_html_error_template_pygments(self):
- assert "".encode(sys.getdefaultencoding(),
- 'htmlentityreplace') in html_error
- else:
--assert 'u''\
-+assert '''\
- 'привет'\
- ''}'.encode(
- sys.getdefaultencoding(),
-@@ -220,7 +220,7 @@ def test_utf8_format_exceptions_pygments(self):
- assert ''привет'' in \
- l.get_template("foo.html").render().decode('utf-8')
- else:
--assert 'u'прив'\
-+assert ''прив'\
- 'ет'' in \
- l.get_template("foo.html").render().decode('utf-8')
-
diff --git a/dev-python/mako/mako-1.0.3.ebuild
b/dev-python/mako/mako-1.0.3.ebuild
deleted file mode 100644
index 8a166b84065..000
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Mako"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/";
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_co
[gentoo-commits] repo/gentoo:master commit in: dev-python/mako/files/, dev-python/mako/
commit: d0b1a79a820876bb97af7ad2fa4391f7940f7524
Author: Michał Górny gentoo org>
AuthorDate: Fri Feb 21 17:34:25 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Feb 21 18:09:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b1a79a
dev-python/mako: Bump to 1.1.1
Signed-off-by: Michał Górny gentoo.org>
dev-python/mako/Manifest | 1 +
dev-python/mako/files/mako-1.1.1-pypy3-test.patch | 31 +++
dev-python/mako/mako-1.1.1.ebuild | 48 +++
3 files changed, 80 insertions(+)
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 8ab7a3689d7..aff83e95afe 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -2,3 +2,4 @@ DIST Mako-1.0.3.tar.gz 565224 BLAKE2B
8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab
DIST Mako-1.0.6.tar.gz 575112 BLAKE2B
c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5
SHA512
15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
DIST Mako-1.0.7.tar.gz 564418 BLAKE2B
c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961
SHA512
d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
DIST Mako-1.1.0.tar.gz 463945 BLAKE2B
31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549
SHA512
acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
+DIST Mako-1.1.1.tar.gz 468894 BLAKE2B
f6ef4f67e369c6d2078b0a7534a765aa254afcf7c373b5d3f8fcac05336b9a46d8391398e4b287fa0826bc03cdbea3361c5225c5e5bcc966f88adb089ff3a5be
SHA512
ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7
diff --git a/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
b/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
new file mode 100644
index 000..6ae5c04ab99
--- /dev/null
+++ b/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
@@ -0,0 +1,31 @@
+From 5559e0205c7fbf2f4a321a978249a41c1d073278 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Fri, 21 Feb 2020 19:03:29 +0100
+Subject: [PATCH] Skip broken test on PyPy3
+
+---
+ test/test_exceptions.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/test_exceptions.py b/test/test_exceptions.py
+index 2ec46cf..6a30b48 100644
+--- a/test/test_exceptions.py
b/test/test_exceptions.py
+@@ -1,5 +1,6 @@
+ # -*- coding: utf-8 -*-
+ import sys
++import unittest
+
+ from mako import compat
+ from mako import exceptions
+@@ -429,6 +430,7 @@ ${foo()}
+ else:
+ assert False
+
++@unittest.skipIf(hasattr(sys, 'pypy_version_info'), 'Broken on pypy3')
+ def test_alternating_file_names(self):
+ l = TemplateLookup()
+ l.put_string(
+--
+2.25.1
+
diff --git a/dev-python/mako/mako-1.1.1.ebuild
b/dev-python/mako/mako-1.1.1.ebuild
new file mode 100644
index 000..bd9a5bccac5
--- /dev/null
+++ b/dev-python/mako/mako-1.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1 eutils
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/";
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+
+DEPEND="
+ test? (
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/mako-1.1.1-pypy3-test.patch
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ rm -r doc/build || die
+
+ use doc && local HTML_DOCS=( doc/. )
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog "Optional dependencies:"
+ optfeature "caching support" dev-python/beaker
+}
[gentoo-commits] repo/gentoo:master commit in: dev-python/mako/files/, dev-python/mako/
commit: 55e0ea0547613a8d3586859557c45580ae4fd1ad
Author: Aaron W. Swenson gentoo org>
AuthorDate: Sat Jun 3 21:04:51 2017 +
Commit: Aaron Swenson gentoo org>
CommitDate: Sat Jun 3 21:05:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e0ea05
dev-python/mako: Version bump
Bump version to 1.0.6. Add patch to correct test failure regarding
Pygment (Bug 577128).
Bug: https://bugs.gentoo.org/577128
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-python/mako/Manifest | 1 +
dev-python/mako/files/pygments-exception.patch | 32 +++
dev-python/mako/mako-1.0.6.ebuild | 56 ++
3 files changed, 89 insertions(+)
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index b2c11b175f5..0afe01bbc9a 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,2 +1,3 @@
DIST Mako-1.0.0.tar.gz 470006 SHA256
a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512
81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a
WHIRLPOOL
aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
DIST Mako-1.0.3.tar.gz 565224 SHA256
7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512
1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
WHIRLPOOL
4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583
+DIST Mako-1.0.6.tar.gz 575112 SHA256
48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d SHA512
15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
WHIRLPOOL
dd0c12f2b8fe6f65907df662de73117eb11afee015f3acd2c70c8522456a7c52761a1bfe8247ce9e88a4ca704008a120be95893f3c3b1b0e410c1a244af011ba
diff --git a/dev-python/mako/files/pygments-exception.patch
b/dev-python/mako/files/pygments-exception.patch
new file mode 100644
index 000..0d2faca4f68
--- /dev/null
+++ b/dev-python/mako/files/pygments-exception.patch
@@ -0,0 +1,32 @@
+From 8eaf6b7ea92018202a886e1d919e2c6b0d307c99 Mon Sep 17 00:00:00 2001
+From: Mike Bayer
+Date: Mon, 22 May 2017 22:30:54 -0400
+Subject: [PATCH] - exception test fixes for more recent pygments
+
+Change-Id: Ibdfe5b2f2f3d1426921bcadf6740ae065ed0833b
+---
+ test/test_exceptions.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_exceptions.py b/test/test_exceptions.py
+index 8321b25..bcaae3b 100644
+--- a/test/test_exceptions.py
b/test/test_exceptions.py
+@@ -91,7 +91,7 @@ def test_utf8_html_error_template_pygments(self):
+ assert "".encode(sys.getdefaultencoding(),
+ 'htmlentityreplace') in html_error
+ else:
+-assert 'u''\
++assert '''\
+ 'привет'\
+ ''}'.encode(
+ sys.getdefaultencoding(),
+@@ -220,7 +220,7 @@ def test_utf8_format_exceptions_pygments(self):
+ assert ''привет'' in \
+ l.get_template("foo.html").render().decode('utf-8')
+ else:
+-assert 'u'прив'\
++assert ''прив'\
+ 'ет'' in \
+ l.get_template("foo.html").render().decode('utf-8')
+
diff --git a/dev-python/mako/mako-1.0.6.ebuild
b/dev-python/mako/mako-1.0.6.ebuild
new file mode 100644
index 000..2cc45b62337
--- /dev/null
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako";
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]'
python2_7)
+ )"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/pygments-exception.patch" )
+
+python_test() {
+ nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ rm -rf doc/build || die
+
+ use doc && local HTML_DOCS=( doc/.
