From 9018f42a324eef4e80fda8f8a55370ba8e3a3c06 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Fri, 5 Aug 2011 17:05:11 +0000 Subject: [PATCH] Reintroduced avoid testing thanks to Arfrever Package-Manager: portage-2.1.10.10/cvs/Linux x86_64 --- dev-python/pygraphviz/ChangeLog | 8 +++- dev-python/pygraphviz/Manifest | 11 ++--- .../files/pygraphviz-1.1-avoid_tests.patch | 41 +++++++++++++++++++ ...iz-1.1.ebuild => pygraphviz-1.1-r1.ebuild} | 6 +-- 4 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 dev-python/pygraphviz/files/pygraphviz-1.1-avoid_tests.patch rename dev-python/pygraphviz/{pygraphviz-1.1.ebuild => pygraphviz-1.1-r1.ebuild} (89%) diff --git a/dev-python/pygraphviz/ChangeLog b/dev-python/pygraphviz/ChangeLog index 449739dc44ae..36d6459b120f 100644 --- a/dev-python/pygraphviz/ChangeLog +++ b/dev-python/pygraphviz/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/pygraphviz # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.10 2011/07/29 23:21:03 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.11 2011/08/05 17:05:11 bicatali Exp $ + +*pygraphviz-1.1-r1 (05 Aug 2011) + + 05 Aug 2011; Sébastien Fabbro -pygraphviz-1.1.ebuild, + +pygraphviz-1.1-r1.ebuild, +files/pygraphviz-1.1-avoid_tests.patch: + Reintroduced tavoid testing thanks to Arfrever *pygraphviz-1.1 (29 Jul 2011) diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest index c4e07b446a23..ba95a802d31e 100644 --- a/dev-python/pygraphviz/Manifest +++ b/dev-python/pygraphviz/Manifest @@ -3,16 +3,17 @@ Hash: SHA1 AUX pygraphviz-1.0-avoid_tests.patch 1237 RMD160 c1e75aeabc9f5845235c2c5393fe270db1f02348 SHA1 1c5020f08a2487cc5c5412d58e1f153e132eb405 SHA256 e51b10fd6a38bd191e60631f2fa547f61d502e247ece6d5d5dfa3ca61a2c1642 AUX pygraphviz-1.0-setup.py.patch 1215 RMD160 c356d6acda1130e21b5048e984de59bcf68de904 SHA1 bf46119d7537555d2acf8ae66bd8e08a1c6b2c8d SHA256 d9b33fb2c9e7a29664f735d050a2f3a4ace7322a0260b6b4a14dc859fb259d25 +AUX pygraphviz-1.1-avoid_tests.patch 1312 RMD160 ef750364afee0b4e4688605a2f7067520dad710d SHA1 b2ebe5841a647e1f808b5b5830b3e479a7fad3d0 SHA256 5582f6e6425e9d61377ac0b949b6781cf6f0be63580623df5534b3d0d1d797ec DIST pygraphviz-1.0.tar.gz 87236 RMD160 c2651201f841a5a04c3b0ff13d437576d44dc28a SHA1 093d16ce9c9f2591788fe990631f866ee207c6bd SHA256 f5c9b81993bbbcb3f6c5d172c035cde65298dccc7c377f34b0f524efaa12ba80 DIST pygraphviz-1.1.tar.gz 90750 RMD160 cc5d25de26d33af082e70fe6b3eec3ce250ab33d SHA1 301079e53c31b756788cc65acff6bf807dd0956e SHA256 2179434df2228bc1b452039dae841700c1733e25011af075383fbded2984db96 EBUILD pygraphviz-1.0-r1.ebuild 1327 RMD160 9928392be6199bc01f14069452c18a83c4b26bcb SHA1 88871cdbd1ba59eebfff6506f264dc3f70df9584 SHA256 e6cefb32b63b0313b07aa6d36a3fe918bac2b6e914a9dade2c6d4a46b7709a27 -EBUILD pygraphviz-1.1.ebuild 1285 RMD160 1be7bb99dd7d8b095e75fc967c91953319c44454 SHA1 4dbaa1bb7358f08b5d99a3d3046e8016bcfc7545 SHA256 5b698f8dabb2b58501c5701b25a7f77e377580068e6d09bd6532acc0d09fe2b9 -MISC ChangeLog 1663 RMD160 bbcd882c4bcc4aed108da05491b3acb363a88ec9 SHA1 f269a2b46f21ea9aa2806b751f75ca306ac47e5a SHA256 cb3e55f4c328adfd16d130f491b52fbaf41645b85941517bc80e9ecae8b0e194 +EBUILD pygraphviz-1.1-r1.ebuild 1324 RMD160 eae1e4d0f6b15b361d4ed78dd7a93f31e6b3f435 SHA1 a93a66e9e5b87bafcbc9b6c7df6b9b3664eecdc9 SHA256 768eab4279584c7a2cac45a472f23c6302471fa71fe24b57332d78ac7fa30307 +MISC ChangeLog 1896 RMD160 4edbe01ea41193f6a2d72fa8a5ea1a5c322f071d SHA1 a25b218803163c4039cc96c90ad01b5018495460 SHA256 7f3b092f81fbb25dfd833c72d38ab962efd8ad9d2eb6b6185173e81c2a40ec3b MISC metadata.xml 450 RMD160 0b1ad4d0244f4488b611020cb62da7e53950cc0f SHA1 12b513b5f8214e531054b1a3124d255a2d709a42 SHA256 d557a44d61bc5f7b285ce29d9ab787670018d052ac525f03e13e878e83dd6b06 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4zQGgACgkQ1ycZbhPLE2B/3gCfSUVcFoA9/pN93XEcCw9P9BGX -J/MAoJ7RlJjOpwJYXkmj671v0LEQjQ9s -=mEmL +iEYEARECAAYFAk48ItAACgkQ1ycZbhPLE2CtDACggoRGFQLtRX6UjsS/WGLhTISd +NJIAn1ztZ4et23WyKnyUX2I/M93D2HlG +=r+UD -----END PGP SIGNATURE----- diff --git a/dev-python/pygraphviz/files/pygraphviz-1.1-avoid_tests.patch b/dev-python/pygraphviz/files/pygraphviz-1.1-avoid_tests.patch new file mode 100644 index 000000000000..0d52e968bf0a --- /dev/null +++ b/dev-python/pygraphviz/files/pygraphviz-1.1-avoid_tests.patch @@ -0,0 +1,41 @@ +--- pygraphviz/agraph.py ++++ pygraphviz/agraph.py +@@ -1767,29 +1767,3 @@ + value.decode(self.encoding)) + except KeyError: # gv.agxget returned KeyError, skip + continue +- +- +- +-def _test_suite(): +- import doctest +- suite = doctest.DocFileSuite('tests/graph.txt', +- 'tests/attributes.txt', +- 'tests/layout_draw.txt', +- 'tests/subgraph.txt', +- package='pygraphviz') +- doctest.testmod() # test docstrings in module +- return suite +- +- +-if __name__ == "__main__": +- import os +- import sys +- import unittest +- if sys.version_info[:2] < (2, 4): +- print "Python version 2.4 or later required for tests (%d.%d detected)." % sys.version_info[:2] +- sys.exit(-1) +- # directory of package (relative to this) +- nxbase=sys.path[0]+os.sep+os.pardir +- sys.path.insert(0,nxbase) # prepend to search path +- unittest.TextTestRunner().run(_test_suite()) +- +--- pygraphviz/__init__.py ++++ pygraphviz/__init__.py +@@ -67,6 +67,3 @@ + print "pygraphviz-"+__version__ + neato=_get_prog('neato') + os.system(neato+' -V') +- +-# import tests: run as pygraphviz.test() +-from tests import run as test diff --git a/dev-python/pygraphviz/pygraphviz-1.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.1-r1.ebuild similarity index 89% rename from dev-python/pygraphviz/pygraphviz-1.1.ebuild rename to dev-python/pygraphviz/pygraphviz-1.1-r1.ebuild index db292036eb88..3aa09e73fcc7 100644 --- a/dev-python/pygraphviz/pygraphviz-1.1.ebuild +++ b/dev-python/pygraphviz/pygraphviz-1.1-r1.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.1.ebuild,v 1.1 2011/07/29 23:21:03 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.1-r1.ebuild,v 1.1 2011/08/05 17:05:11 bicatali Exp $ EAPI="3" -PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" +RESTRICT_PYTHON_ABIS="3.* *-jython" inherit distutils eutils @@ -24,6 +23,7 @@ DEPEND="${RDEPEND}" src_prepare() { distutils_src_prepare epatch "${FILESDIR}"/${PN}-1.0-setup.py.patch + epatch "${FILESDIR}"/${P}-avoid_tests.patch } src_test() { -- 2.26.2