From ba2732024d545a5c97adf7714007d147b4845e5c Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 22 Mar 2018 14:26:40 -0500
Subject: [PATCH 1/7] Add travis ci

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ca56642
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+sudo: false
+language: python
+python:
+  - "3.4"
+install: pip install tox-travis
+script:
+  - tox -c tox.ini -e pep8
+  - tox -c tox.ini -e py34

From 58579384aaaf43ab9fee916a9946a2b6581fb193 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 22 Mar 2018 14:29:45 -0500
Subject: [PATCH 2/7] Allow pep8 tox target to use any py3 version

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 6fcaae0..9d6f648 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
-basepython = python3.6
+basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} zaza unit_tests
 
@@ -31,4 +31,4 @@ commands = flake8 {posargs} zaza unit_tests
 commands = {posargs}
 
 [flake8]
-ignore = E402,E226
\ No newline at end of file
+ignore = E402,E226

From 5bb735bb285f3522273f704f8a40ce00c4cb1082 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 22 Mar 2018 15:10:58 -0500
Subject: [PATCH 3/7] Fix existing lint

---
 zaza/tempest_config.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zaza/tempest_config.py b/zaza/tempest_config.py
index a80ba96..24ad2d5 100644
--- a/zaza/tempest_config.py
+++ b/zaza/tempest_config.py
@@ -1,5 +1,4 @@
 import argparse
-import zaza
 
 
 def parser(args=None):
@@ -19,4 +18,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

From ce93194a1fcb619b736f5af56274489dda188ca2 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 22 Mar 2018 15:13:53 -0500
Subject: [PATCH 4/7] Fix additional lint

---
 zaza/model.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zaza/model.py b/zaza/model.py
index d1803e3..db10db5 100644
--- a/zaza/model.py
+++ b/zaza/model.py
@@ -22,8 +22,8 @@ async def deployed(filter=None):
 def main():
     # Run the deploy coroutine in an asyncio event loop, using a helper
     # that abstracts loop creation and teardown.
-    print("Current applications: {}".format( ", ".join(loop.run(deployed()))))
+    print("Current applications: {}".format(", ".join(loop.run(deployed()))))
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

From d6c07d1d725e222a836ea4b313aa0b14476d50ac Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 22 Mar 2018 15:16:39 -0500
Subject: [PATCH 5/7] Try to get travis to use xenial

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

diff --git a/.travis.yml b/.travis.yml
index ca56642..db35f0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 sudo: false
 language: python
+dist: xenial
 python:
   - "3.4"
 install: pip install tox-travis

From 62c28c675b90a860780aa95692c6800f7ccb53d7 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 22 Mar 2018 15:23:37 -0500
Subject: [PATCH 6/7] Move pep8 back to 3.6 due to async usage

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 9d6f648..1bad802 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
-basepython = python3
+basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} zaza unit_tests
 

From 246cfd07b6f6d59b9aef2a7df2a36fd1abed452f Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 22 Mar 2018 15:25:42 -0500
Subject: [PATCH 7/7] Update travis definition

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index db35f0a..6c40395 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ sudo: false
 language: python
 dist: xenial
 python:
-  - "3.4"
+  - "3.6"
 install: pip install tox-travis
 script:
   - tox -c tox.ini -e pep8
-  - tox -c tox.ini -e py34
+  - tox -c tox.ini -e py36