| 1 |
commit: b1c25642401d33feefa67e3ce728d3c34afb0e1f |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 28 12:26:18 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 28 12:26:24 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c25642 |
| 7 |
|
| 8 |
dev-python/columnize: Fix setup.py to use tests_requires and correct deps to pytest |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=539818 |
| 11 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=561734 |
| 12 |
|
| 13 |
see Github rocky/pycolumnize#24 |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.22 |
| 16 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-python/columnize/columnize-0.3.5-r1.ebuild | 2 ++ |
| 19 |
dev-python/columnize/columnize-0.3.8.ebuild | 2 ++ |
| 20 |
dev-python/columnize/files/columnize-0.3.5-nose.patch | 15 +++++++++++++++ |
| 21 |
dev-python/columnize/files/columnize-0.3.8-nose.patch | 15 +++++++++++++++ |
| 22 |
4 files changed, 34 insertions(+) |
| 23 |
|
| 24 |
diff --git a/dev-python/columnize/columnize-0.3.5-r1.ebuild b/dev-python/columnize/columnize-0.3.5-r1.ebuild |
| 25 |
index 4d71319..579c0a2 100644 |
| 26 |
--- a/dev-python/columnize/columnize-0.3.5-r1.ebuild |
| 27 |
+++ b/dev-python/columnize/columnize-0.3.5-r1.ebuild |
| 28 |
@@ -20,6 +20,8 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 29 |
test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
| 30 |
RDEPEND="" |
| 31 |
|
| 32 |
+PATCHES=( "${FILESDIR}"/${P}-nose.patch ) |
| 33 |
+ |
| 34 |
python_test() { |
| 35 |
nosetests || die "tests failed" |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/dev-python/columnize/columnize-0.3.8.ebuild b/dev-python/columnize/columnize-0.3.8.ebuild |
| 39 |
index 54782b7..5d94ec2 100644 |
| 40 |
--- a/dev-python/columnize/columnize-0.3.8.ebuild |
| 41 |
+++ b/dev-python/columnize/columnize-0.3.8.ebuild |
| 42 |
@@ -22,6 +22,8 @@ DEPEND=" |
| 43 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 44 |
test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
| 45 |
|
| 46 |
+PATCHES=( "${FILESDIR}"/${P}-nose.patch ) |
| 47 |
+ |
| 48 |
python_test() { |
| 49 |
py.test || die |
| 50 |
} |
| 51 |
|
| 52 |
diff --git a/dev-python/columnize/files/columnize-0.3.5-nose.patch b/dev-python/columnize/files/columnize-0.3.5-nose.patch |
| 53 |
new file mode 100644 |
| 54 |
index 0000000..f09f770 |
| 55 |
--- /dev/null |
| 56 |
+++ b/dev-python/columnize/files/columnize-0.3.5-nose.patch |
| 57 |
@@ -0,0 +1,15 @@ |
| 58 |
+ setup.py | 2 +- |
| 59 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 60 |
+ |
| 61 |
+diff --git a/setup.py b/setup.py |
| 62 |
+index e1035eb..bb8eaf6 100755 |
| 63 |
+--- a/setup.py |
| 64 |
++++ b/setup.py |
| 65 |
+@@ -26,6 +26,6 @@ setup( |
| 66 |
+ url = web, |
| 67 |
+ version = VERSION, |
| 68 |
+ py_modules = py_modules, |
| 69 |
+- setup_requires = ['nose>=1.0'], |
| 70 |
++ tests_requires = ['nose>=1.0'], |
| 71 |
+ zip_safe = zip_safe |
| 72 |
+ ) |
| 73 |
|
| 74 |
diff --git a/dev-python/columnize/files/columnize-0.3.8-nose.patch b/dev-python/columnize/files/columnize-0.3.8-nose.patch |
| 75 |
new file mode 100644 |
| 76 |
index 0000000..956e033 |
| 77 |
--- /dev/null |
| 78 |
+++ b/dev-python/columnize/files/columnize-0.3.8-nose.patch |
| 79 |
@@ -0,0 +1,15 @@ |
| 80 |
+ setup.py | 2 +- |
| 81 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 82 |
+ |
| 83 |
+diff --git a/setup.py b/setup.py |
| 84 |
+index 4a4b238..854d3e1 100755 |
| 85 |
+--- a/setup.py |
| 86 |
++++ b/setup.py |
| 87 |
+@@ -33,6 +33,6 @@ setup( |
| 88 |
+ version = VERSION, |
| 89 |
+ py_modules = py_modules, |
| 90 |
+ install_requires = install_requires, |
| 91 |
+- setup_requires = ['nose>=1.0'], |
| 92 |
++ tests_requires = ['pytest'], |
| 93 |
+ zip_safe = zip_safe |
| 94 |
+ ) |
Archives