jenkins-bot has submitted this change and it was merged.

Change subject: wrap lint/tests in tox environments ......................................................................

wrap lint/tests in tox environments

* got rid of .pep8, the configuration is now done in a [pep8] section of tox.ini which recent version of pep8 uses * add support for flake8, a wrapper around pep8 and pyflakes which also introduces its own tests * envs for py26 and py27 testing

The user configuration file is not generated yet :/

Change-Id: Ic8dfb837d21879f0d2aa70c6647a5a941a7bf2d7 --- M .gitignore D .pep8 A tox.ini 3 files changed, 30 insertions(+), 5 deletions(-)

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

diff --git a/.gitignore b/.gitignore index a2ea9ff..df24ac5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,10 @@ user-*.py *.bak *.pyc +/.tox +/*.egg data* logs* *cache* .idea -Pywikipediabot.egg-info/ \ No newline at end of file +Pywikipediabot.egg-info/ diff --git a/.pep8 b/.pep8 deleted file mode 100644 index 4e25b06..0000000 --- a/.pep8 +++ /dev/null @@ -1,4 +0,0 @@ -[pep8] -ignore = E122,E127,E241,E502 -exclude = .git,ez_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py -max_line_length = 256 diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..b6a3d4a --- /dev/null +++ b/tox.ini @@ -0,0 +1,27 @@ +[tox] +minversion = 1.6 +skipsdist = True +envlist = flake8,py26,py27 + +[testenv] +setenv = VIRTUAL_ENV={envdir} +usedevelop = True +commands = python setup.py test +install_command = pip install --process-dependency-links --pre {opts} {packages} + +[testenv:flake8] +commands = flake8 +deps = flake8 + +[testenv:venv] +commands = {posargs} + +[flake8] +ignore = E122,E127,E241,E502 +exclude = .tox,.git,ez_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py +max_line_length = 256 + +[pep8] +ignore = E122,E127,E241,E502 +exclude = .tox,.git,ez_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py +max_line_length = 256