Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/124325
Change subject: Wrapper around tox for Wikimedia Jenkins
......................................................................
Wrapper around tox for Wikimedia Jenkins
The Wikiomedia Jenkins jobs invoke tox commands at the root of the
repository and hence expect a tox.ini there. This patch creates the
basic tox configuration which basically invokes tox under /server/ . We
could probably move everything at the root of the repository but I did
not want to be too invasive.
List test requirement (nose, coverage) in the new test-requirements.txt
file.
Ignore flake8 error in setup.pyp due to multiprocessing module being
imported but never used.
Configure pep8/flake8 via server/setup.cfg
Change-Id: Ib5d341a8f5cffce906d8b237345c8030607c0905
---
M server/setup.cfg
M server/setup.py
A server/test-requirements.txt
M server/tox.ini
A tox.ini
5 files changed, 39 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/25/124325/1
diff --git a/server/setup.cfg b/server/setup.cfg
index fcb657d..92faca3 100644
--- a/server/setup.cfg
+++ b/server/setup.cfg
@@ -8,3 +8,10 @@
[aliases]
# Release builds should have no tags other than the version number.
release = egg_info -RDb ''
+
+
+[flake8]
+exclude=.tox,.venv,build,dist,doc,*.egg,*.egg-info
+
+[pep8]
+exclude=.tox,.venv,build,dist,doc,*.egg,*.egg-info
diff --git a/server/setup.py b/server/setup.py
index dcd3313..439fd22 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -14,7 +14,7 @@
from distutils.core import setup
# Workaround for <http://bugs.python.org/issue15881#msg170215>:
-import multiprocessing
+import multiprocessing # noqa
setup(
diff --git a/server/test-requirements.txt b/server/test-requirements.txt
new file mode 100644
index 0000000..33f4945
--- /dev/null
+++ b/server/test-requirements.txt
@@ -0,0 +1,2 @@
+coverage
+nose
diff --git a/server/tox.ini b/server/tox.ini
index 2007ea0..4f4c3bf 100644
--- a/server/tox.ini
+++ b/server/tox.ini
@@ -11,13 +11,20 @@
# .. _virtualenv: http://pypi.python.org/pypi/virtualenv
[tox]
-envlist = py27, py33
+# Please redefine environement in /tox.ini
+envlist = py27, py33, flake8
+skipsdist = true
[testenv]
-deps =
- nose
- coverage
+setenv = VIRTUAL_ENV={envdir}
+deps = -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
commands = nosetests \
--verbose \
--with-coverage \
--cover-package=eventlogging
+
+[testenv:flake8]
+commands = flake8
+# No need to install any other dependency
+deps = flake8
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..25903dd
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+# tox wrapper for /server/tox.ini
+
+[tox]
+setupdir={toxinidir}/server
+skipsdist = true
+
+[testenv]
+commands = tox -c {toxinidir}/server/tox.ini -e {envname}
+changedir={toxinidir}/server
+deps = tox
+
+# Redefine envs from /server/tox.ini
+
+[testenv:flake8]
+
+[testenv:py27]
+
+[testenv:py33]
--
To view, visit https://gerrit.wikimedia.org/r/124325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5d341a8f5cffce906d8b237345c8030607c0905
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
