From 0fe3c555ea8e053ff30bc08b2e24ead5b2e9c2dc Mon Sep 17 00:00:00 2001
From: Rossen Georgiev <rossen@rgp.io>
Date: Tue, 24 Nov 2015 22:23:43 +0200
Subject: [PATCH] test with travis + tox

---
 .scrutinizer.yml |  4 ++--
 .travis.yml      |  8 ++------
 Makefile         |  2 +-
 tox.ini          | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 tox.ini

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 37eb797..0f07119 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -4,5 +4,5 @@ filter:
         - 'vcr/*'
 tools:
     external_code_coverage:
-        timeout: 300
-        runs: 3
+        timeout: 600
+        runs: 1
diff --git a/.travis.yml b/.travis.yml
index f7ce8b5..e2a3ce5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,10 @@
 language: python
-python:
-    - "2.7"
-    - "3.3"
-    - "3.4"
 install:
-    - make init
+    - pip install tox
     - pip install coveralls
     - pip install scrutinizer-ocular
 script:
-    - make test
+    - tox
 after_success:
     - coveralls
     - ocular
diff --git a/Makefile b/Makefile
index 159863c..2b05a14 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ init:
 	pip install -r requirements.txt
 
 test:
-	rm -f .coverage steam/*.pyc tests/*.pyc
+	coverage erase
 	PYTHONHASHSEED=0 nosetests --verbosity 1 --with-coverage --cover-package=steam
 
 pylint:
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..e914daf
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,17 @@
+[tox]
+envlist = py27, py33, py34, pypy
+
+[testenv]
+setenv =
+    PYTHONHASHSEED = 0
+deps =
+    nose
+    coverage
+    mock
+    requests
+    enum34
+    vcrpy
+    pyyaml
+commands =
+    coverage erase
+	nosetests --verbosity 1 --with-coverage --cover-package=steam