From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93EDD139694 for ; Tue, 16 May 2017 02:10:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A63F9E0D43; Tue, 16 May 2017 02:10:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B3F9E0D43 for ; Tue, 16 May 2017 02:10:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B25E23416D7 for ; Tue, 16 May 2017 02:10:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B78AC7462 for ; Tue, 16 May 2017 02:10:49 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1494900429.d0d8046cc0523fffbc271e41be8345bd256e5d1e.dolsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/blockdiag/files/, dev-python/blockdiag/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch X-VCS-Directories: dev-python/blockdiag/files/ dev-python/blockdiag/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: d0d8046cc0523fffbc271e41be8345bd256e5d1e X-VCS-Branch: master Date: Tue, 16 May 2017 02:10:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1886f0c6-b851-409b-a136-284e55f085d4 X-Archives-Hash: ecbf17b4a26ba788d8c8e756de81d35d commit: d0d8046cc0523fffbc271e41be8345bd256e5d1e Author: Brian Dolbec gentoo org> AuthorDate: Mon Apr 10 14:45:37 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue May 16 02:07:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d8046c dev-python/blockdiag: Add python-3.5, 3.6 to PYTHON_COMPAT Add python_test(), update deps as needed to fix tests, was missing webcolors and ipafonts dependencies (not listed in setup.py. Fix test failure in python-2.7 due to test needing to be updated to same as py3 NOTE: requires FEATURES=-network-sandbox for test_command.py (to fetch some icons) Package-Manager: Portage-2.3.5, Repoman-2.3.2_p30 dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild | 8 +++++--- .../blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild index 7496b2c82d8..3f571f97e94 100644 --- a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild +++ b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit distutils-r1 @@ -29,17 +29,19 @@ DEPEND=" dev-python/reportlab[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] >=dev-python/pep8-1.3[${PYTHON_USEDEP}] + media-fonts/ja-ipafonts ) " +PATCHES=( "${FILESDIR}/blockdiag-1.5.3-py2_7-test-fix.patch") python_prepare_all() { sed -i -e /build-base/d setup.cfg || die distutils-r1_python_prepare_all } python_test() { - ALL_TESTS=1 \ - esetup.py test + # NOTE: requires FEATURES="-network-sandbox" for some tests to pass + nosetests || die "Tests fail with ${EPYTHON}" } pkg_postinst() { diff --git a/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch b/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch new file mode 100644 index 00000000000..e9ccfc82b9a --- /dev/null +++ b/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch @@ -0,0 +1,12 @@ +diff -r 07f96892bfda src/blockdiag/tests/test_utils_fontmap.py +--- a/src/blockdiag/tests/test_utils_fontmap.py Sat Aug 22 13:38:35 2015 +0900 ++++ b/src/blockdiag/tests/test_utils_fontmap.py Mon Apr 10 05:56:48 2017 -0700 +@@ -223,7 +223,7 @@ + _config = u("[fontmap]\nsansserif: %s\nsansserif: %s\n") % \ + (self.fontpath[0], self.fontpath[1]) + config = StringIO(_config) +- if sys.version_info[0] == 2: ++ if sys.version_info < (2, 7): + fmap = FontMap(config) + + font1 = fmap.find()