From 25f45ec19a623e729a95a78e37a1005ea9a7f941 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Thu, 7 Jan 2016 00:17:36 +0100
Subject: [PATCH] Add py32-django18 combination (tox)

---
 .travis.yml | 30 ++++++++++++++++--------------
 setup.py    |  2 +-
 tox.ini     |  4 ++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad171a3..d1cc97e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,21 @@
 language: python
-python:
-  - "3.5"
+python: "3.5"
 install:
   - pip install coveralls tox
 script:
   - tox
-env:  # generate list with: $ tox -l | sort | xargs -I ITEM echo "  - TOXENV="ITEM
-    - TOXENV=py27-django17
-    - TOXENV=py27-django18
-    - TOXENV=py27-django19
-    - TOXENV=py32-django17
-    - TOXENV=py33-django17
-    - TOXENV=py33-django18
-    - TOXENV=py34-django17
-    - TOXENV=py34-django18
-    - TOXENV=py34-django19
-    - TOXENV=py35-django18
-    - TOXENV=py35-django19
+# NOTE: To generate (update) the env list run
+# $ tox -l | sort | xargs -I ITEM echo "  - TOXENV="ITEM
+env:
+  - TOXENV=py27-django17
+  - TOXENV=py27-django18
+  - TOXENV=py27-django19
+  - TOXENV=py32-django17
+  - TOXENV=py32-django18
+  - TOXENV=py33-django17
+  - TOXENV=py33-django18
+  - TOXENV=py34-django17
+  - TOXENV=py34-django18
+  - TOXENV=py34-django19
+  - TOXENV=py35-django18
+  - TOXENV=py35-django19
diff --git a/setup.py b/setup.py
index 6d0697e..9361840 100644
--- a/setup.py
+++ b/setup.py
@@ -92,8 +92,8 @@ setup(
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
diff --git a/tox.ini b/tox.ini
index bfaa433..3f6996d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
     py{27,32,33,34}-django17,
-    py33-django18,
-    py{27,34,35}-django{18,19}
+    py{27,32,33,34,35}-django18,
+    py{27,34,35}-django19
 
 [testenv]
 commands =