jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/387603 )

Change subject: [test] Don't use flake8-import-order test I202 ......................................................................

[test] Don't use flake8-import-order test I202

Alternate to I47d6a9367d132

Change-Id: Ifdf8c4aa6dcd6ddbbf2b9116266581c1cc85ed91 --- M tests/deprecation_tests.py M tests/edit_failure_tests.py M tox.ini 3 files changed, 4 insertions(+), 2 deletions(-)

Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified

diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index 49b7465..e8fa034 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -10,6 +10,7 @@ from pywikibot.tools import ( deprecated, deprecate_arg, deprecated_args, add_full_name, remove_last_args ) + from tests.aspects import unittest, DeprecationTestCase

diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py index ccaa479..237fa57 100644 --- a/tests/edit_failure_tests.py +++ b/tests/edit_failure_tests.py @@ -24,6 +24,7 @@ NoCreateError, PageCreatedConflict, ) + from tests.aspects import unittest, TestCase, WikibaseTestCase

diff --git a/tox.ini b/tox.ini index e12ea9b..504dc70 100644 --- a/tox.ini +++ b/tox.ini @@ -144,7 +144,7 @@ # H236: Mandatory use of six for Python 2 & 3 metaclass support # H404: docstring multiline start # H405: docstring summary line -# H301,I100,I101: import order rules; Pywikibot uses rules H306 and I201 +# H301,I100,I101,202: import order rules; Pywikibot uses rules H306 and I201

# The following are to be fixed # C401, C402, C405: does not work with py 2.6 @@ -160,7 +160,7 @@ # D413: Missing blank line after last section # D412: No blank lines allowed between a section header and its content

-ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101,N802,N803,N806,D401,D413,D103,D412 +ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101,I202,N802,N803,N806,D401,D413,D103,D412 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* min-version = 2.6 max_line_length = 100