From 29202454c61a10dadae505c729d674b25e553945 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 12 Oct 2015 09:21:24 +0300
Subject: [PATCH 1/4] Run Travis integration tests with the right Python
 version

---
 .travis.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d030e014f8c..0c3e686b3fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,22 @@
 sudo: false
 language: python
-env:
-  - TOKENV=py24
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py34
-  - TOXENV=py35
+matrix:
+  include:
+    - env: TOKENV=py24 INTEGRATION=no
+    - env: TOXENV=py26 INTEGRATION=yes
+      python: 2.6
+    - env: TOXENV=py27 INTEGRATION=yes
+      python: 2.7
+    - env: TOXENV=py34 INTEGRATION=no
+      python: 3.4
+    - env: TOXENV=py35 INTEGRATION=no
+      python: 3.5
 addons:
   apt:
     sources:
       - deadsnakes
     packages:
       - python2.4
-      - python3.5-dev
 install:
   - pip install tox PyYAML Jinja2 sphinx
 script:
@@ -21,6 +25,6 @@ script:
 - if test x"$TOKENV" != x'py24' ; then  tox ; fi
 - if test x"$TOKENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi
   #- make -C docsite all
-- source ./hacking/env-setup && cd test/integration/ && make test_var_precedence
+- if test x"$INTEGRATION" = x'yes' ; then source ./hacking/env-setup && cd test/integration/ && make test_var_precedence ; fi
 after_success:
   - coveralls

From e31e866e79db1e98547bc22b20da0e319955d806 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 12 Oct 2015 09:29:34 +0300
Subject: [PATCH 2/4] Can we even ask for Python 2.4 on Travis?

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

diff --git a/.travis.yml b/.travis.yml
index 0c3e686b3fe..58fea062f04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 matrix:
   include:
     - env: TOKENV=py24 INTEGRATION=no
+      python: 2.4
     - env: TOXENV=py26 INTEGRATION=yes
       python: 2.6
     - env: TOXENV=py27 INTEGRATION=yes

From 43a65c7de483731f615611e155a1b989401f1d8c Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 12 Oct 2015 09:30:37 +0300
Subject: [PATCH 3/4] Revert "Can we even ask for Python 2.4 on Travis?"

Becaue we can't: https://travis-ci.org/mgedmin/ansible/jobs/84866458

This reverts commit e31e866e79db1e98547bc22b20da0e319955d806.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 58fea062f04..0c3e686b3fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: python
 matrix:
   include:
     - env: TOKENV=py24 INTEGRATION=no
-      python: 2.4
     - env: TOXENV=py26 INTEGRATION=yes
       python: 2.6
     - env: TOXENV=py27 INTEGRATION=yes

From 9802c006a2fb309a0941305ac72573405c86e098 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Tue, 13 Oct 2015 09:17:57 +0300
Subject: [PATCH 4/4] Typo: TOKENV -> TOXENV

This is purely cosmetic: the logic worked correctly, since tox never saw
the TOKENV environment variable.
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c3e686b3fe..9efa0fb60f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 language: python
 matrix:
   include:
-    - env: TOKENV=py24 INTEGRATION=no
+    - env: TOXENV=py24 INTEGRATION=no
     - env: TOXENV=py26 INTEGRATION=yes
       python: 2.6
     - env: TOXENV=py27 INTEGRATION=yes
@@ -22,8 +22,8 @@ install:
 script:
 # urllib2's defaults are not secure enough for us
 - ./test/code-smell/replace-urlopen.sh .
-- if test x"$TOKENV" != x'py24' ; then  tox ; fi
-- if test x"$TOKENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi
+- if test x"$TOXENV" != x'py24' ; then tox ; fi
+- if test x"$TOXENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi
   #- make -C docsite all
 - if test x"$INTEGRATION" = x'yes' ; then source ./hacking/env-setup && cd test/integration/ && make test_var_precedence ; fi
 after_success: