Merge pull request #16 from hobbestigrou/16-use_tox

Use tox.
openuado · Jun 4, 2015 · 1ee69c3 · 1ee69c3
2 parents 823bc20 + 2132b69
commit 1ee69c3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,12 @@
 language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "pypy"
-
 install:
-  - "pip install . --use-mirrors"
-  - "pip install -r requirements.txt --use-mirrors"
-script: nosetests --nologcapture --all-modules tests
+    pip install tox
+env:
+    matrix:
+        - TOXENV=py27
+        - TOXENV=py33
+        - TOXENV=flake8
+script: make test
 notifications:
   irc:
     - "irc.freenode.org#Hobbestigrou"

diff --git a/Makefile b/Makefile
@@ -0,0 +1,2 @@
+test:
+	tox
diff --git a/pylocwolowitz/__init__.py b/pylocwolowitz/__init__.py
@@ -1 +1,2 @@
+# flake8: noqa
 from .core import Pylocwolowitz
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,19 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27, py33, flake8
+
+[testenv]
+commands =
+    pip install -e ./
+    pip install -r requirements.txt
+    nosetests --nologcapture --all-modules tests
+deps = nose
+
+[testenv:flake8]
+commands =
+    flake8 pylocwolowitz
+deps = flake8