From b652ef7ae717e2cc86380995876b772c84975f82 Mon Sep 17 00:00:00 2001
From: Per A Brodtkorb <per.andreas.brodtkorb@gmail.com>
Date: Sat, 13 Feb 2016 14:48:20 +0100
Subject: [PATCH] Updated tox.ini

---
 tox.ini          | 33 ++++++++++++++++++++-------------
 wafo/__init__.py |  3 ++-
 wafo/misc.py     |  2 +-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/tox.ini b/tox.ini
index 653a2fe..be70a9b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,21 +4,28 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py32, py33, py34, report
+minversion = 1.8
+envlist = py27
+skip_missing_interpreters = True
+
 
 [testenv]
-changedir=tests
-deps =
-    -r./requirements.txt
-    coverage
-    coveralls
-commands =
-    coverage run --source=wafo setup.py test
+changedir = -r{toxinidir}/wafo
 
-[testenv:report]
-basepython = python2.7
 commands =
-    coverage combine
-    coverage report -m
-usedevelop = true
+     py.test {posargs}
+deps =
+    pytest
+    -r{toxinidir}/requirements.txt
+
+[testenv:flake8]
+changedir = {toxinidir}
+deps = flake8
+commands = flake8 setup.py wafo tests
+
+# Options for flake8
+#[flake8]
 
+# Options for pytest
+[pytest]
+addopts = -rsxXf
diff --git a/wafo/__init__.py b/wafo/__init__.py
index 18cd6cd..81a8a44 100644
--- a/wafo/__init__.py
+++ b/wafo/__init__.py
@@ -1,6 +1,7 @@
 from __future__ import division, print_function, absolute_import
 
 from .info import __doc__
+
 from . import misc
 from . import data
 from . import demos
@@ -24,4 +25,4 @@ except ImportError:
     __version__ = 'nobuilt'
 
 from numpy.testing import Tester
-test = Tester().test 
\ No newline at end of file
+test = Tester().test
diff --git a/wafo/misc.py b/wafo/misc.py
index 89b36ba..c088aaa 100644
--- a/wafo/misc.py
+++ b/wafo/misc.py
@@ -17,7 +17,7 @@ from scipy.special import gammaln, gamma, psi
 from scipy.integrate import trapz, simps
 import warnings
 from time import strftime, gmtime
-from plotbackend import plotbackend
+from .plotbackend import plotbackend
 from collections import OrderedDict
 try:
     import c_library as clib  # @UnresolvedImport