Fix flake8 tox env for testing via travis

applied-mixnetworks · Dec 6, 2016 · fd9a751 · fd9a751
1 parent 1dbd260
commit fd9a751
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,9 @@ language: python
 sudo: required
 dist: precise
 
-install: "sudo apt-get update && sudo apt-get install -y python-dev && pip install -r requirements.txt && pip install -r dev-requirements.txt"
+install: "sudo apt-get update && sudo apt-get install -y python-dev && pip install -r requirements.txt && pip install -r requirements-dev.txt"
 env:
-    - TOX_ENV=flake8
+    - TOX_ENV=style
     - TOX_ENV=py27
     - TOX_ENV=py33
     - TOX_ENV=py34

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,4 @@
 include requirements.txt
+include requirements-dev.txt
 include tests/*.py
+include pylioness/*.py
diff --git a/dev-requirements.txt → requirements-dev.txt b/dev-requirements.txt → requirements-dev.txt
diff --git a/tox.ini b/tox.ini
@@ -1,15 +1,10 @@
 [tox]
-envlist = flake8, {py27,py33,py34,py35}-{pinned,unpinned}
+envlist = style, {py27,py33,py34,py35}-{pinned,unpinned}
 
-[flake8]
-#exclude = crossbar/worker/test/examples/syntaxerror.py
-
-[testenv:flake8]
+[testenv:style]
 skip_install = True
-deps =
-   flake8
-commands =
-   flake8 pylioness
+deps = flake8
+commands = flake8 ..
 basepython = python2.7
 
 [testenv:coverage-erase]