Merge pull request #48 from steenzout/tox

tox

Author: vitalk

.gitignore

@@ -2,8 +2,21 @@
 *.py[co]
 *.egg-info
 build
-dist
-venv
+sdist
+
+__pycache__/
+
+# virtualenv
+venv/
 
 # Sphinx documentation
 docs/_build
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+coverage.xml
+tests/junit.xml

.travis.yml

@@ -1,27 +1,34 @@
 language: python
 
+branches:
+  except:
+    - gh-pages
+
+cache:
+  directories:
+    - "${HOME}/virtualenv"
+    - "${TRAVIS_BUILD_DIR}/.tox"
+
 python:
   - 2.6
   - 2.7
   - 3.3
   - 3.4
+  - 3.5
+  - 3.6
   - pypy
 
-env:
-  - PYTEST=2.3.5
-  - PYTEST=2.4.2
-  - PYTEST=2.5.2
-  - PYTEST=2.6.4
-  - PYTEST=2.7.0
-  - PYTEST=2.7.1
-  - PYTEST=2.7.2
-  - PYTEST=2.7.3
-  - PYTEST=2.8.0
+matrix:
+  fast_finish: true
+  allow_failures:
+    - python: 3.6
+    - python: 3.5
 
 install:
-  - pip install -q pytest==$PYTEST
-  - pip install -q -r requirements/main.txt
-  - pip install -q -e .
+  - pip install tox
+  - pip install tox-travis
 
 script:
-  - py.test
+  - tox
+  - "find ${TRAVIS_BUILD_DIR}/.tox -name log -o -name __pycache__ -type d | xargs -I {} rm -rf {}"
+

MANIFEST.in

@@ -1,5 +1,6 @@
 include README.rst
 include LICENSE
+include tox.ini
 
 recursive-include requirements *.txt
 recursive-include docs *

pytest_flask/fixtures.py

@@ -56,7 +56,8 @@ def __init__(self, app, port):
 
     def start(self):
         """Start application in a separate process."""
-        worker = lambda app, port: app.run(port=port, use_reloader=False)
+        def worker(app, port):
+            app.run(port=port, use_reloader=False)
         self._process = multiprocessing.Process(
             target=worker,
             args=(self.app, self.port)

requirements/main.txt

@@ -1,3 +1,2 @@
 Flask
-Werkzeug>=0.7
-pytest>=2.4
+Werkzeug>=0.7

requirements/test.txt

@@ -0,0 +1,5 @@
+mock
+pylint
+pytest-cov
+pytest-pep8
+pytest-xdist

setup.py

@@ -127,7 +127,7 @@ def get_version():
 
 
 version = get_version()
-requirements = read('requirements', 'main.txt').splitlines()
+requirements = read('requirements', 'main.txt').splitlines() + ['pytest']
 tests_require = []
 
 extras_require = {
@@ -179,7 +179,7 @@ def get_version():
     ],
 
     # The following makes a plugin available to pytest
-    entry_points = {
+    entry_points={
         'pytest11': [
             'flask = pytest_flask.plugin',
         ]

tox.ini

@@ -0,0 +1,54 @@
+[tox]
+envlist =
+    py{36,35,34,33,27,26}-pytest{30,29,28,27,26}
+    pypy-pytest{30,29,28,27,26}
+
+
+[pytest]
+norecursedirs = .git .tox env coverage docs
+pep8ignore =
+    docs/conf.py ALL
+pep8maxlinelength = 119
+
+
+[testenv]
+usedevelop = True
+deps =
+    -rrequirements/main.txt
+    -rrequirements/test.txt
+    pytest23: pytest>=2.3,<2.4
+    pytest24: pytest>=2.4,<2.5
+    pytest25: pytest>=2.5,<2.6
+    pytest26: pytest>=2.6,<2.7
+
+passenv = HOME LANG LC_ALL
+
+commands =
+    py.test -q --basetemp={envtmpdir} --confcutdir=.. -n 1 \
+        --junitxml=tests/junit.xml \
+        --cov-report xml --cov pytest_flask \
+        --cov-report=html \
+        --cov-report term-missing \
+        --pep8 \
+        -n 2 \
+        {posargs}
+
+
+[testenv:docs]
+changedir = docs
+deps = -r../requirements/docs.txt
+
+commands =
+    make html
+
+whitelist_externals =
+    /usr/bin/make
+
+
+[tox:travis]
+2.6 = py26-pytest{30,29,28,27,26}
+2.7 = py27-pytest{30,29,28,27,26}
+3.3 = py33-pytest{30,29,28,27,26}
+3.4 = py34-pytest{30,29,28,27,26}
+3.5 = py35-pytest{30,29,28,27,26}
+3.6 = py36-pytest{30,29,28,27,26}