From 3e0330ad3b7485fa4d9a2568b1e6a68d64b41645 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Sun, 4 Oct 2015 10:51:37 +0300
Subject: [PATCH 1/5] Remove redundancies from tox.ini

---
 tox.ini | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index 02a3d71f2b..9eef9fe721 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py34}
+envlist = py26,py27,py34
 
 [testenv]
 commands = make tests
@@ -11,17 +11,12 @@ commands =
     python --version
     python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
     make tests
-deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals =
-    make
 
 [testenv:py27]
 commands =
     python --version
     python -m compileall -fq -x 'test|samples' lib test contrib
     make tests
-deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = make
 
 [testenv:py34]
 commands =
@@ -29,5 +24,3 @@ commands =
     python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
     # Unittests need lots of work to make code python3 compatible
     #make tests
-deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = make

From e9b114a39b67ade4fbc4a1b928a759aa389657b8 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Sun, 4 Oct 2015 10:57:49 +0300
Subject: [PATCH 2/5] Simplify tox.ini

Use the factor-conditional settings feature of tox >= 1.8 to reduce
duplication:
https://tox.readthedocs.org/en/latest/config.html#factors-and-factor-conditional-settings
---
 tox.ini | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/tox.ini b/tox.ini
index 9eef9fe721..c23f8dc576 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,25 +2,12 @@
 envlist = py26,py27,py34
 
 [testenv]
-commands = make tests
 deps = -r{toxinidir}/test-requirements.txt
 whitelist_externals = make
-
-[testenv:py26]
 commands =
     python --version
-    python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
-    make tests
-
-[testenv:py27]
-commands =
-    python --version
-    python -m compileall -fq -x 'test|samples' lib test contrib
-    make tests
-
-[testenv:py34]
-commands =
-    python --version
-    python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
+    py26: python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
+    py27: python -m compileall -fq -x 'test|samples' lib test contrib
+    py34: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
     # Unittests need lots of work to make code python3 compatible
-    #make tests
+    py{26,27}: make tests

From f1f3bc9e50db7833faaefe49ccd0f224ac64af03 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Sun, 4 Oct 2015 10:58:44 +0300
Subject: [PATCH 3/5] Add Python 3.5 to tox.ini

---
 .travis.yml | 1 +
 tox.ini     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6fb5198dc9..734cc58ce7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
   - TOXENV=py26
   - TOXENV=py27
   - TOXENV=py34
+  - TOXENV=py35
 addons:
   apt:
     sources:
diff --git a/tox.ini b/tox.ini
index c23f8dc576..ec700764ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py34
+envlist = py26,py27,py34,py35
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt
@@ -8,6 +8,6 @@ commands =
     python --version
     py26: python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
     py27: python -m compileall -fq -x 'test|samples' lib test contrib
-    py34: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
+    py{34,35}: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
     # Unittests need lots of work to make code python3 compatible
     py{26,27}: make tests

From 6fec8fef6c1ba70d8d6cb728160fcc9f8e99e1ad Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Tue, 6 Oct 2015 09:23:49 +0300
Subject: [PATCH 4/5] For some reason Python 3.5 wasn't preinstalled on Travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 734cc58ce7..97c62cff67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ addons:
       - deadsnakes
     packages:
       - python2.4
+      - python3.5
 install:
   - pip install tox PyYAML Jinja2 sphinx
 script:

From 3e0fbad4bb985c2229d0986e5cf33a9361928918 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Tue, 6 Oct 2015 09:28:16 +0300
Subject: [PATCH 5/5] We need Python.h to build pycrypto on 3.5

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 97c62cff67..d030e014f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ addons:
       - deadsnakes
     packages:
       - python2.4
-      - python3.5
+      - python3.5-dev
 install:
   - pip install tox PyYAML Jinja2 sphinx
 script: