From b1c25642401d33feefa67e3ce728d3c34afb0e1f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 28 Sep 2015 14:26:18 +0200 Subject: [PATCH] dev-python/columnize: Fix setup.py to use tests_requires and correct deps to pytest Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=539818 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=561734 see Github rocky/pycolumnize#24 Package-Manager: portage-2.2.22 Signed-off-by: Justin Lecher --- dev-python/columnize/columnize-0.3.5-r1.ebuild | 2 ++ dev-python/columnize/columnize-0.3.8.ebuild | 2 ++ .../columnize/files/columnize-0.3.5-nose.patch | 15 +++++++++++++++ .../columnize/files/columnize-0.3.8-nose.patch | 15 +++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 dev-python/columnize/files/columnize-0.3.5-nose.patch create mode 100644 dev-python/columnize/files/columnize-0.3.8-nose.patch diff --git a/dev-python/columnize/columnize-0.3.5-r1.ebuild b/dev-python/columnize/columnize-0.3.5-r1.ebuild index 4d71319180a4..579c0a26494f 100644 --- a/dev-python/columnize/columnize-0.3.5-r1.ebuild +++ b/dev-python/columnize/columnize-0.3.5-r1.ebuild @@ -20,6 +20,8 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] )" RDEPEND="" +PATCHES=( "${FILESDIR}"/${P}-nose.patch ) + python_test() { nosetests || die "tests failed" } diff --git a/dev-python/columnize/columnize-0.3.8.ebuild b/dev-python/columnize/columnize-0.3.8.ebuild index 54782b71ab6b..5d94ec2b761a 100644 --- a/dev-python/columnize/columnize-0.3.8.ebuild +++ b/dev-python/columnize/columnize-0.3.8.ebuild @@ -22,6 +22,8 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}"/${P}-nose.patch ) + python_test() { py.test || die } diff --git a/dev-python/columnize/files/columnize-0.3.5-nose.patch b/dev-python/columnize/files/columnize-0.3.5-nose.patch new file mode 100644 index 000000000000..f09f7704cbab --- /dev/null +++ b/dev-python/columnize/files/columnize-0.3.5-nose.patch @@ -0,0 +1,15 @@ + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index e1035eb..bb8eaf6 100755 +--- a/setup.py ++++ b/setup.py +@@ -26,6 +26,6 @@ setup( + url = web, + version = VERSION, + py_modules = py_modules, +- setup_requires = ['nose>=1.0'], ++ tests_requires = ['nose>=1.0'], + zip_safe = zip_safe + ) diff --git a/dev-python/columnize/files/columnize-0.3.8-nose.patch b/dev-python/columnize/files/columnize-0.3.8-nose.patch new file mode 100644 index 000000000000..956e033b729d --- /dev/null +++ b/dev-python/columnize/files/columnize-0.3.8-nose.patch @@ -0,0 +1,15 @@ + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 4a4b238..854d3e1 100755 +--- a/setup.py ++++ b/setup.py +@@ -33,6 +33,6 @@ setup( + version = VERSION, + py_modules = py_modules, + install_requires = install_requires, +- setup_requires = ['nose>=1.0'], ++ tests_requires = ['pytest'], + zip_safe = zip_safe + ) -- 2.26.2