From 7e350939bb657022c7c14fa32bfc929e0098a968 Mon Sep 17 00:00:00 2001
From: Rob Moorman <rob@moori.nl>
Date: Wed, 23 Nov 2016 22:44:56 +0100
Subject: [PATCH] Removed tox Use travis python 3.5

---
 .travis.yml | 14 ++++++--------
 Makefile    |  2 +-
 setup.py    |  3 ++-
 tox.ini     | 12 ------------
 4 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index 3274c30..294a7b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
 sudo: false
 language: python
-matrix:
-  include:
-    - env: TOXENV=py27
-      python: 2.7
-    - env: TOXENV=py35
-      python: 3.5
+python:
+  - "2.7"
+  - "3.5"
 install:
-  - pip install coveralls tox 
+  - pip install coveralls
+  - pip install -e .[test]
 script:
-  - tox -e $TOXENV
+  - python -m py.test --cov=src/wagtailbakery --cov-report=xml tests/
 after_success:
   - coveralls
diff --git a/Makefile b/Makefile
index ebe0143..32f0c7a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,4 +20,4 @@ isort:
 lint: flake8 isort
 
 test:
-	python -m py.test tests
+	python -m py.test tests/
diff --git a/setup.py b/setup.py
index 6dc1a1f..12ca51d 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,8 @@
     'isort==4.2.5',
     'pytest==3.0.4',
     'pytest-cov==2.4.0',
-    'pytest-django==3.1.1'
+    'pytest-django==3.1.1',
+    'wagtail>=1.7,<1.8',
 ]
 
 setup(
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index d9f1ad0..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[tox]
-envlist=py27,py35
-
-[testenv]
-basepython =
-    py27: python2.7
-    py35: python3.5
-commands=
-    pip install -e .[test]
-	python -m py.test --cov=src/wagtailbakery --cov-report=xml tests/
-deps=
-    wagtail>=1.7,<1.8