1 |
commit: 1cbd13afa14a227b1434e04a02153b338bf0551c |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 5 21:18:19 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 5 22:54:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbd13af |
7 |
|
8 |
dev-python/pytest-shutil: Remove stale contextlib2 dep |
9 |
|
10 |
contextlib2 is needed only on Python 2. Strip the unconditional dep |
11 |
from setup.py (upstream made it conditional in newer git). |
12 |
|
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
...shutil-1.7.0-r1.ebuild => pytest-shutil-1.7.0-r2.ebuild} | 13 ++++++------- |
16 |
1 file changed, 6 insertions(+), 7 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild |
19 |
similarity index 82% |
20 |
rename from dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild |
21 |
rename to dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild |
22 |
index cee304ff4f5..8ee1fa7aea6 100644 |
23 |
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild |
24 |
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild |
25 |
@@ -1,10 +1,9 @@ |
26 |
# Copyright 1999-2021 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI=7 |
30 |
- |
31 |
-PYTHON_COMPAT=( python3_{7..10} pypy3 ) |
32 |
+EAPI=8 |
33 |
|
34 |
+PYTHON_COMPAT=( python3_{8..10} pypy3 ) |
35 |
inherit distutils-r1 |
36 |
|
37 |
DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test" |
38 |
@@ -18,7 +17,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64 |
39 |
RDEPEND=" |
40 |
dev-python/pytest[${PYTHON_USEDEP}] |
41 |
dev-python/six[${PYTHON_USEDEP}] |
42 |
- dev-python/contextlib2[${PYTHON_USEDEP}] |
43 |
dev-python/execnet[${PYTHON_USEDEP}] |
44 |
dev-python/path-py[${PYTHON_USEDEP}] |
45 |
dev-python/mock[${PYTHON_USEDEP}] |
46 |
@@ -34,11 +32,12 @@ BDEPEND=" |
47 |
dev-python/setuptools-git[${PYTHON_USEDEP}] |
48 |
" |
49 |
|
50 |
-distutils_enable_tests --install setup.py |
51 |
+distutils_enable_tests --install pytest |
52 |
|
53 |
python_prepare_all() { |
54 |
- # keeps trying to install this in tests |
55 |
- sed -i 's:path.py::' setup.py || die |
56 |
+ # remove unnecessary deps |
57 |
+ # (contextlib2 is not used in py3) |
58 |
+ sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die |
59 |
|
60 |
distutils-r1_python_prepare_all |
61 |
} |