From a12471e1d13557c49e59f45776a5401c34854008 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 23 Nov 2020 22:46:15 -0500 Subject: [PATCH] empire deps: xlutils taken from gentoo --- dev-python/manuel/Manifest | 1 + .../files/manuel-1.8.0-rm_zope_test.patch | 120 ++++++++++++++++++ dev-python/manuel/manuel-1.9.0.ebuild | 31 +++++ dev-python/manuel/metadata.xml | 12 ++ dev-python/xlutils/Manifest | 1 + .../files/xlutils-2.0.0-fix-tests.patch | 23 ++++ dev-python/xlutils/metadata.xml | 11 ++ dev-python/xlutils/xlutils-2.0.0-r1.ebuild | 44 +++++++ .../pentoo/base/package.keywords/dev-python | 1 + profiles/pentoo/base/package.unmask | 1 + 10 files changed, 245 insertions(+) create mode 100644 dev-python/manuel/Manifest create mode 100644 dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch create mode 100644 dev-python/manuel/manuel-1.9.0.ebuild create mode 100644 dev-python/manuel/metadata.xml create mode 100644 dev-python/xlutils/Manifest create mode 100644 dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch create mode 100644 dev-python/xlutils/metadata.xml create mode 100644 dev-python/xlutils/xlutils-2.0.0-r1.ebuild diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest new file mode 100644 index 000000000..8ab00f097 --- /dev/null +++ b/dev-python/manuel/Manifest @@ -0,0 +1 @@ +DIST manuel-1.9.0.tar.gz 39640 BLAKE2B 1b699b92816297fee13a65ed2c4fc9ee3683f8e47e7fbf06178c97167ae29cabcedc48edec48b053f725889b39111b3634f0305ac651b5674292d046434fd134 SHA512 519b0fd1bd7ef3414dec69f721a6f1265603d28e3b61681acf46e9fba6fdc66efb6c0a82d814af8348bb7c07c3c4c299ae94ea7d6415436592ac37fccaacf18a diff --git a/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch b/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch new file mode 100644 index 000000000..d1b61cc67 --- /dev/null +++ b/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch @@ -0,0 +1,120 @@ + setup.py | 6 ------ + src/manuel/index.txt | 26 ++++++++------------------ + src/manuel/tests.py | 13 +++++++++---- + 3 files changed, 17 insertions(+), 28 deletions(-) + +diff --git a/setup.py b/setup.py +index 4561779..b6730c8 100644 +--- a/setup.py ++++ b/setup.py +@@ -20,8 +20,6 @@ with open('README.rst') as readme: + with open('CHANGES.rst') as changes: + long_description = readme.read() + '\n\n' + changes.read() + +-tests_require = ['zope.testing'] +- + setup( + name='manuel', + version='1.8.0', +@@ -44,10 +42,6 @@ setup( + 'License :: OSI Approved :: Apache Software License', + ], + license='Apache Software License, Version 2.0', +- extras_require={ +- 'tests': tests_require, +- }, +- tests_require=tests_require, + test_suite='manuel.tests.test_suite', + install_requires=[ + 'setuptools', +diff --git a/src/manuel/index.txt b/src/manuel/index.txt +index c1d85f3..a315317 100644 +--- a/src/manuel/index.txt ++++ b/src/manuel/index.txt +@@ -166,16 +166,16 @@ can pass in your own class to `TestSuite`. + + .. code-block:: python + +- import os.path +- import manuel.testing ++ import os.path ++ import manuel.testing + +- class StripDirsTestCase(manuel.testing.TestCase): +- def shortDescription(self): +- return os.path.basename(str(self)) +- suite = manuel.testing.TestSuite( +- m, path_to_test, TestCase=StripDirsTestCase) ++ class StripDirsTestCase(manuel.testing.TestCase): ++ def shortDescription(self): ++ return os.path.basename(str(self)) ++ suite = manuel.testing.TestSuite( ++ m, path_to_test, TestCase=StripDirsTestCase) + +- >>> list(suite)[0].shortDescription() ++ list(suite)[0].shortDescription() + 'bugs.txt' + + +@@ -236,16 +236,6 @@ checkers `_ + smoothes over the differences between CPython's and PyPy's NameError + messages: + +-.. code-block:: python +- +- import re +- import zope.testing.renormalizing +- checker = zope.testing.renormalizing.RENormalizing([ +- (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"), +- r"NameError: name '\1' is not defined"), +- ]) +- +- + .. reset-globs + .. _capture: + +diff --git a/src/manuel/tests.py b/src/manuel/tests.py +index 07723a6..b1a3a76 100644 +--- a/src/manuel/tests.py ++++ b/src/manuel/tests.py +@@ -11,11 +11,12 @@ import manuel.testing + import os.path + import re + import unittest +-import zope.testing.renormalizing + + here = os.path.dirname(os.path.abspath(__file__)) + +-checker = zope.testing.renormalizing.RENormalizing([ ++try: ++ import zope.testing.renormalizing ++ checker = zope.testing.renormalizing.RENormalizing([ + (re.compile(r" + + + + zerochaos@gentoo.org + Zero_Chaos + + + benji-york/manuel + manuel + + diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest new file mode 100644 index 000000000..905cd18e1 --- /dev/null +++ b/dev-python/xlutils/Manifest @@ -0,0 +1 @@ +DIST xlutils-2.0.0.tar.gz 61614 BLAKE2B 51fde8ef1a0a88ecccfb3cfb332fe8a31101d29865cfa6201001d272db34a5f210e988ccb99ba00344f80dd457a5c91866af12061af9342d556953700cf02916 SHA512 7b6c39912a2b23d718b1aaac2f21770f1e5b156fdc7416f11d4a7e6b52195ffffb982aecb52b5571599eb4928c7e09bbfb20fdf2554f0c49c286b243e2fb3ea9 diff --git a/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch b/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch new file mode 100644 index 000000000..b7e749250 --- /dev/null +++ b/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch @@ -0,0 +1,23 @@ +From e9edf279ba2e699be92da7611368cf92b4d87cec Mon Sep 17 00:00:00 2001 +From: Chris Withers +Date: Wed, 4 Apr 2018 08:05:06 +0100 +Subject: [PATCH] fix test expectations + +--- + xlutils/tests/test_view.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/xlutils/tests/test_view.py b/xlutils/tests/test_view.py +index 7b32892..5b4aa2b 100644 +--- a/xlutils/tests/test_view.py ++++ b/xlutils/tests/test_view.py +@@ -219,6 +219,8 @@ def test_does_not_match(self): + ('XX',) + + actual: +-(u'',)''' ++(u'',) ++ ++While comparing [5][1]: 'XX' (expected) != u'' (actual)''' + + compare(expected, actual=str(s.raised)) diff --git a/dev-python/xlutils/metadata.xml b/dev-python/xlutils/metadata.xml new file mode 100644 index 000000000..651194394 --- /dev/null +++ b/dev-python/xlutils/metadata.xml @@ -0,0 +1,11 @@ + + + + + zerochaos@gentoo.org + Zero_Chaos + + + xlutils + + diff --git a/dev-python/xlutils/xlutils-2.0.0-r1.ebuild b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild new file mode 100644 index 000000000..b9fe409d5 --- /dev/null +++ b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 + +DESCRIPTION="provides a collection of utilities for working with Excel files" +HOMEPAGE="https://pypi.org/project/xlutils/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=dev-python/xlwt-1.3[${PYTHON_USEDEP}] + >=dev-python/xlrd-1.2[${PYTHON_USEDEP}]" + +DEPEND="${RDEPEND} + test? ( + >=dev-python/errorhandler-2[${PYTHON_USEDEP}] + >=dev-python/manuel-1.9[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/testfixtures[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-fix-tests.patch" +) + +python_test() { + # upstream runs its tests with nose, but the suite actually runs better + # when ran through pytest... + pytest -vv || die "Tests fail with ${EPYTHON}" +} diff --git a/profiles/pentoo/base/package.keywords/dev-python b/profiles/pentoo/base/package.keywords/dev-python index a981f3c55..4db0b4bcf 100644 --- a/profiles/pentoo/base/package.keywords/dev-python +++ b/profiles/pentoo/base/package.keywords/dev-python @@ -3,3 +3,4 @@ #empire =dev-python/xlutils-2.0* amd64 x86 +=dev-python/errorhandler-2.0* amd64 x86 diff --git a/profiles/pentoo/base/package.unmask b/profiles/pentoo/base/package.unmask index b44f53534..aee20818d 100644 --- a/profiles/pentoo/base/package.unmask +++ b/profiles/pentoo/base/package.unmask @@ -5,6 +5,7 @@ virtual/jre:11 #gentoo is removing this but we aren't net-proxy/mitmproxy net-wireless/rfcat +dev-python/xlutils #https://bugs.gentoo.org/735216 app-forensics/openscap