From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-python/subunit/Manifest | 5 +- dev-python/subunit/files/1.0.0-tests.patch | 25 -------- dev-python/subunit/subunit-1.2.0-r1.ebuild | 96 ------------------------------ dev-python/subunit/subunit-1.4.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 dev-python/subunit/files/1.0.0-tests.patch delete mode 100644 dev-python/subunit/subunit-1.2.0-r1.ebuild (limited to 'dev-python/subunit') diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest index b630308ac337..acb8c4d8f6dd 100644 --- a/dev-python/subunit/Manifest +++ b/dev-python/subunit/Manifest @@ -1,6 +1,3 @@ -AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0 -DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf -EBUILD subunit-1.2.0-r1.ebuild 2621 BLAKE2B 4e4f4caf6ea78a783a23ee20c251051bc78fcc933b099e4729c1ecd1a3d9b63a86519ec76d29eaba337c932ab969bd0493419ab2eb50436492e7894fc3ac6bd9 SHA512 f0d0a2053f0f09155605d1fdbb2fcdb089d4b6bf1881c61e8caef4d470bd6281f1ef8b11d2202e1b0ddf8cb90f7cd0657570c777694f707b7396d69a0d1da320 -EBUILD subunit-1.4.0.ebuild 2402 BLAKE2B 2b23d8e6cb91ea563724e49ee40270574e67efc183f8ecd446f4df67f789395c25e7622c98585848c153f161a2f10ab4053edd5f779dcb3a66d73a93e3dd41a2 SHA512 409bfcca1ef18bb4ee01291f3598e6d31b2e3df56bc5ac6aadfc00d734aa7f494e0ff5fee86531111abf868925aab90bddd0921ed0fe6b87730b1e7f19b12b0b +EBUILD subunit-1.4.0.ebuild 2393 BLAKE2B 63ab420a93aca76d9d7c92a6f3fd50ced3267a6bbe076688e904220a6e9102de3138944faa63cdad2bbbf441233659e1076003d0c55812e8a9c9ea276849f106 SHA512 990b8897a6bd8b3af9f101bbd23677bf18e265e2089e793d2c188a5632abfea4e59f5dc10341800b7e01fd1701829f4aabe19c7282bddfebb60253704f41cbd4 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8 diff --git a/dev-python/subunit/files/1.0.0-tests.patch b/dev-python/subunit/files/1.0.0-tests.patch deleted file mode 100644 index d83a1900cbe1..000000000000 --- a/dev-python/subunit/files/1.0.0-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ur subunit-1.0.0.orig/python/subunit/tests/test_run.py subunit-1.0.0/python/subunit/tests/test_run.py ---- python/subunit/tests/test_run.py 2014-11-18 16:59:26.000000000 +0800 -+++ python/subunit/tests/test_run.py 2015-03-26 13:25:19.193341069 +0800 -@@ -77,21 +77,6 @@ - exc = self.assertRaises(SystemExit, runner.list, None, loader=loader) - self.assertEqual((2,), exc.args) - -- class FailingTest(TestCase): -- def test_fail(self): -- 1/0 -- -- def test_exits_zero_when_tests_fail(self): -- bytestream = io.BytesIO() -- stream = io.TextIOWrapper(bytestream, encoding="utf8") -- try: -- self.assertEqual(None, run.main( -- argv=["progName", "subunit.tests.test_run.TestSubunitTestRunner.FailingTest"], -- stdout=stream)) -- except SystemExit: -- self.fail("SystemExit raised") -- self.assertThat(bytestream.getvalue(), StartsWith(_b('\xb3'))) -- - class ExitingTest(TestCase): - def test_exit(self): - raise SystemExit(0) diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild deleted file mode 100644 index 69fe77e2dca1..000000000000 --- a/dev-python/subunit/subunit-1.2.0-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) - -inherit distutils-r1 eutils ltprune multilib-minimal versionator - -DESCRIPTION="A streaming protocol for test results" -HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/" -SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz" - -LICENSE="Apache-2.0 BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - dev-python/extras[${PYTHON_USEDEP}] - dev-lang/perl:=" - -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] - >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] - virtual/pkgconfig - test? ( - dev-python/fixtures[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - dev-python/testscenarios[${PYTHON_USEDEP}] - )" - -# Take out rogue & trivial failing tests that exit the suite before it even gets started -# The removed class in fact works fine in py3 and fails with py2.7 & pupu -# The setu to restrict this patch is just those 2 is not worth it. -PATCHES=( "${FILESDIR}"/1.0.0-tests.patch ) - -src_prepare() { - sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die - - # Install perl modules in vendor_perl, bug 534654. - export INSTALLDIRS=vendor - - # needed for perl modules - distutils-r1_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -multilib_src_compile() { - default - multilib_is_native_abi && distutils-r1_src_compile -} - -python_test() { - local -x PATH="${PWD}/shell/share:${PATH}" - local -x PYTHONPATH=python - # Following tests are known to fail in py2.7 & pypy. They pass under py3. - # DO NOT re-file - # test_add_error test_add_error_details test_add_expected_failure - # test_add_expected_failure_details test_add_failure test_add_failure - # https://bugs.launchpad.net/subunit/+bug/1436686 - - "${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}" -} - -multilib_src_test() { - multilib_is_native_abi && distutils-r1_src_test -} - -multilib_src_install() { - local targets=( - install-include_subunitHEADERS - install-pcdataDATA - install-exec-local - install-libLTLIBRARIES - ) - emake DESTDIR="${D}" "${targets[@]}" - - multilib_is_native_abi && distutils-r1_src_install -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild index 65fdd6aed637..0719cf5c65f3 100644 --- a/dev-python/subunit/subunit-1.4.0.ebuild +++ b/dev-python/subunit/subunit-1.4.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" LICENSE="Apache-2.0 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" IUSE="static-libs test" RESTRICT="!test? ( test )" -- cgit v1.2.3