1 |
commit: a24551360af1bed102b9186695980a4ca5893776 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 22 02:02:10 2016 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 22 02:03:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2455136 |
7 |
|
8 |
dev-python/flake8: Fix incorrect mccage dep in DEPEND |
9 |
|
10 |
This is causing a conflict with itself with FEATURES=test enabled. |
11 |
I discovered this conflict attempting to bump dev-python/treq. |
12 |
Also, with this correction, there is one test failure: |
13 |
|
14 |
> assert parsed_config['ignore'] == ['E123', 'W234', 'E111'] |
15 |
E assert ['# Disable E...e E111\nE111'] == ['E123', 'W234', 'E111'] |
16 |
E At index 0 diff: '# Disable E123\nE123' != 'E123' |
17 |
E Use -v to get the full diff |
18 |
|
19 |
tests/unit/test_merged_config_parser.py:201: AssertionError |
20 |
|
21 |
Package-Manager: portage-2.3.1_p4 |
22 |
|
23 |
.../{flake8-3.0.4-r1.ebuild => flake8-3.0.4-r2.ebuild} | 16 +++++++--------- |
24 |
1 file changed, 7 insertions(+), 9 deletions(-) |
25 |
|
26 |
diff --git a/dev-python/flake8/flake8-3.0.4-r1.ebuild b/dev-python/flake8/flake8-3.0.4-r2.ebuild |
27 |
similarity index 90% |
28 |
rename from dev-python/flake8/flake8-3.0.4-r1.ebuild |
29 |
rename to dev-python/flake8/flake8-3.0.4-r2.ebuild |
30 |
index b80756e..5b4d64e 100644 |
31 |
--- a/dev-python/flake8/flake8-3.0.4-r1.ebuild |
32 |
+++ b/dev-python/flake8/flake8-3.0.4-r2.ebuild |
33 |
@@ -27,21 +27,19 @@ RDEPEND=" |
34 |
<=dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}] |
35 |
$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy ) |
36 |
" |
37 |
-DEPEND="${RDEPEND} |
38 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
39 |
- test? ( ${PDEPEND} |
40 |
- dev-python/nose[${PYTHON_USEDEP}] |
41 |
- dev-python/pytest-runner[${PYTHON_USEDEP}] |
42 |
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) |
43 |
- >=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}] |
44 |
- <dev-python/mccabe-0.5[${PYTHON_USEDEP}] |
45 |
- )" |
46 |
PDEPEND=" |
47 |
>=dev-python/mccabe-0.5.0[${PYTHON_USEDEP}] |
48 |
<dev-python/mccabe-0.6[${PYTHON_USEDEP}] |
49 |
>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}] |
50 |
<=dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}] |
51 |
" |
52 |
+DEPEND="${RDEPEND} |
53 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
54 |
+ test? ( ${PDEPEND} |
55 |
+ dev-python/nose[${PYTHON_USEDEP}] |
56 |
+ dev-python/pytest-runner[${PYTHON_USEDEP}] |
57 |
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) |
58 |
+ )" |
59 |
|
60 |
python_prepare_all() { |
61 |
# Gentoo has flake8 support restored in >=pep8-1.6.2-r1. |