From d51069ade8cddf94e91cb9485f7800fdb2d0efd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Ga=C5=82uszka?= <galuszkak@gmail.com>
Date: Wed, 17 Sep 2014 20:26:46 +0200
Subject: [PATCH 1/2] added tox_tests

---
 .travis.yml | 28 +++++++++++++------
 tox.ini     | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index 0344e41..e8c194c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,23 @@
 language: python
-python:
-  - "2.7"
+python: "2.7"
+env:
+  matrix:
+    - TOXENV=py27-dj1.4.x
+    - TOXENV=py27-dj1.5.x
+    - TOXENV=py27-dj1.6.x
+    - TOXENV=py27-dj1.7.x
+    - TOXENV=py33-dj1.6.x
+    - TOXENV=py34-dj1.6.x
+    - TOXENV=py33-dj1.7.x
+    - TOXENV=py34-dj1.7.x
+    - TOXENV=pypy-dj1.6.x,
+    - TOXENV=pypy3-dj1.6.x
 install:
-  - pip install -r requirements.txt
+  - pip install tox
 script:
-  - coverage run runtests.py
-after_success:
-  - coverage report
-  - pip install --quiet python-coveralls
-  - coveralls
+  - tox -e $TOX_ENV
+#for now commented 
+#after_success:
+#  - coverage report
+#  - pip install --quiet python-coveralls
+#  - coveralls
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..501ac46
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,79 @@
+[tox]
+# for py 3.x we are using only django 1.6.x as 1.5.x had only "experimental py3 support"
+envlist = py27-dj1.4.x, py27-dj1.5.x, py27-dj1.6.x, py27-dj1.7.x,
+          py33-dj1.6.x, py34-dj1.6.x, py33-dj1.7.x, py34-dj1.7.x,
+          pypy-dj1.6.x, pypy3-dj1.6.x,
+skipsdist = True
+
+[testenv]
+commands = python runtests.py
+deps =
+     django-braces>=1.0.0
+     django-extra-views>=0.6.2
+     djangorestframework>=2.3.3
+     django-floppyforms>=1.1
+     django-filter>=0.6
+     django-crispy-forms>=1.3.2
+     django-debug-toolbar>=0.9.4
+
+[testenv:py27-dj1.4.x]
+basepython=python2.7
+deps =
+    Django>=1.4,<1.5
+    {[testenv]deps}
+
+[testenv:py27-dj1.5.x]
+basepython=python2.7
+deps =
+    Django>=1.5,<1.6
+    {[testenv]deps}
+
+[testenv:py27-dj1.6.x]
+commands = coverage run runtests.py
+basepython=python2.7
+deps =
+    Django>=1.6,<1.7
+    coverage
+    {[testenv]deps}
+
+[testenv:py27-dj1.7.x]
+basepython=python2.7
+deps =
+    Django>=1.7,<1.8
+    {[testenv]deps}
+
+[testenv:py33-dj1.6.x]
+basepython=python3.3
+deps =
+    Django>=1.6,<1.7
+    {[testenv]deps}
+
+[testenv:py34-dj1.6.x]
+basepython=python3.4
+deps =
+    Django>=1.6,<1.7
+    {[testenv]deps}
+
+[testenv:py33-dj1.7.x]
+basepython=python3.3
+deps =
+    Django>=1.7,<1.8
+    {[testenv]deps}
+
+[testenv:py34-dj1.7.x]
+basepython=python3.4
+deps =
+    Django>=1.7,<1.8
+    {[testenv]deps}
+
+[testenv:pypy-dj1.6.x]
+basepython=pypy
+deps =
+    Django>=1.6,<1.7
+    {[testenv]deps}
+
+[testenv:pypy3-dj1.6.x]
+basepython=pypy3
+deps =
+    Django>=1.6,<1.7
+    {[testenv]deps}

From 3d79503b5823d4edfc74882cadd7c08474bcf3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Ga=C5=82uszka?= <galuszkak@gmail.com>
Date: Wed, 17 Sep 2014 20:31:19 +0200
Subject: [PATCH 2/2]  fix to TOX_ENV fail ;)

---
 .travis.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8c194c..57bde0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,21 +2,21 @@ language: python
 python: "2.7"
 env:
   matrix:
-    - TOXENV=py27-dj1.4.x
-    - TOXENV=py27-dj1.5.x
-    - TOXENV=py27-dj1.6.x
-    - TOXENV=py27-dj1.7.x
-    - TOXENV=py33-dj1.6.x
-    - TOXENV=py34-dj1.6.x
-    - TOXENV=py33-dj1.7.x
-    - TOXENV=py34-dj1.7.x
-    - TOXENV=pypy-dj1.6.x,
-    - TOXENV=pypy3-dj1.6.x
+    - TOX_ENV=py27-dj1.4.x
+    - TOX_ENV=py27-dj1.5.x
+    - TOX_ENV=py27-dj1.6.x
+    - TOX_ENV=py27-dj1.7.x
+    - TOX_ENV=py33-dj1.6.x
+    - TOX_ENV=py34-dj1.6.x
+    - TOX_ENV=py33-dj1.7.x
+    - TOX_ENV=py34-dj1.7.x
+    - TOX_ENV=pypy-dj1.6.x,
+    - TOX_ENV=pypy3-dj1.6.x
 install:
   - pip install tox
 script:
   - tox -e $TOX_ENV
-#for now commented 
+#for now commented
 #after_success:
 #  - coverage report
 #  - pip install --quiet python-coveralls