Removed tox

Use travis python 3.5
wagtail-nest · Nov 23, 2016 · 7e35093 · 7e35093
1 parent 2b25a98
commit 7e35093
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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