From cc0e2ba2d3f7fc6516fd322e30bb66924457245d Mon Sep 17 00:00:00 2001
From: SR4ven <46794237+SR4ven@users.noreply.github.com>
Date: Mon, 20 May 2019 01:42:13 +0200
Subject: [PATCH 1/5] Run tests against multiple python versions

---
 .travis.yml      | 28 +++++++++++++++++++++++-----
 CONTRIBUTING.rst | 10 ++++++----
 tox.ini          |  3 +++
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01973ec3..f0b24a04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,28 @@
-language: python
 dist: xenial
 sudo: required
-
-before_install: sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
+language: python
+cache: pip
 
 stages:
   - Test
+  - name: Deploy
+    if: (repo = jtpereyda/boofuzz) AND (fork = false) AND (tag IS present)
 
 jobs:
   include:
     - stage: Test
-      install: pip install tox
-      script: tox --recreate
+      python: 2.7
+      env: TOXENV=py27-unix
+    - python: 3.6
+      env: TOXENV=py36-unix
+    - python: 3.7
+      env: TOXENV=py37-unix
+    - python: 3.8
+      env: TOXENV=py38-unix
+
+    - stage: Deploy
+      install: true
+      script: skip
       deploy:
         provider: pypi
         user: jtpereyda
@@ -23,3 +34,10 @@ jobs:
           tags: true
           repo: jtpereyda/boofuzz
           branch: master
+
+  allow_failures:
+    - python: 3.8
+
+before_install: sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
+install: pip install tox
+script: tox --skip-missing-interpreters false
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 86bfdd31..924cc583 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -18,15 +18,17 @@ See installation instructions for details on installing boofuzz from source with
 Pull Request Checklist
 ----------------------
 
-1. Verify tests pass: ::
+1. Install python version 2.7.9+ **and** 3.6+
+
+2. Verify tests pass: ::
 
       tox
 
-2. If you have PyCharm, use it to see if your changes introduce any new static analysis warnings.
+3. If you have PyCharm, use it to see if your changes introduce any new static analysis warnings.
 
-3. Modify CHANGELOG.rst to say what you changed.
+4. Modify CHANGELOG.rst to say what you changed.
 
-4. If adding a new module, consider adding it to the Sphinx docs (see ``docs`` folder).
+5. If adding a new module, consider adding it to the Sphinx docs (see ``docs`` folder).
 
 Maintainers
 ===========
diff --git a/tox.ini b/tox.ini
index 4440c7a9..f5ee2a22 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,10 @@
 [tox]
+skip_missing_interpreters = True
 envlist =
     py27-{unix,windows}
     py36-{unix,windows}
+    py37-{unix,windows}
+    py38-{unix,windows}
 
 [testenv]
 whitelist_externals =

From 942d2ac264e9c27103bd70f3c7df2480537d7480 Mon Sep 17 00:00:00 2001
From: SR4ven <46794237+SR4ven@users.noreply.github.com>
Date: Mon, 20 May 2019 02:05:07 +0200
Subject: [PATCH 2/5] Removed pip cache, adjusted py38 name

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

diff --git a/.travis.yml b/.travis.yml
index f0b24a04..035a35ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 dist: xenial
 sudo: required
 language: python
-cache: pip
 
 stages:
   - Test
@@ -17,7 +16,7 @@ jobs:
       env: TOXENV=py36-unix
     - python: 3.7
       env: TOXENV=py37-unix
-    - python: 3.8
+    - python: 3.8-dev
       env: TOXENV=py38-unix
 
     - stage: Deploy
@@ -36,7 +35,7 @@ jobs:
           branch: master
 
   allow_failures:
-    - python: 3.8
+    - python: 3.8-dev
 
 before_install: sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
 install: pip install tox

From d99a6c99d4909bd4f4f1a8bce0bfe6e58f6e2d37 Mon Sep 17 00:00:00 2001
From: SR4ven <46794237+SR4ven@users.noreply.github.com>
Date: Mon, 20 May 2019 02:13:54 +0200
Subject: [PATCH 3/5] Use fast_finish to speed up the test result

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

diff --git a/.travis.yml b/.travis.yml
index 035a35ba..2ecbcbe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ jobs:
           repo: jtpereyda/boofuzz
           branch: master
 
+  fast_finish: true
   allow_failures:
     - python: 3.8-dev
 

From fa88b1147138c14d8c3296f88e70fc44758908b1 Mon Sep 17 00:00:00 2001
From: SR4ven <46794237+SR4ven@users.noreply.github.com>
Date: Mon, 20 May 2019 02:25:17 +0200
Subject: [PATCH 4/5] Removed py38 tests

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ecbcbe1..afdf3fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,6 @@ jobs:
       env: TOXENV=py36-unix
     - python: 3.7
       env: TOXENV=py37-unix
-    - python: 3.8-dev
-      env: TOXENV=py38-unix
 
     - stage: Deploy
       install: true
@@ -34,10 +32,6 @@ jobs:
           repo: jtpereyda/boofuzz
           branch: master
 
-  fast_finish: true
-  allow_failures:
-    - python: 3.8-dev
-
 before_install: sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
 install: pip install tox
 script: tox --skip-missing-interpreters false

From 50a0e150e5646de637e535eb5e868473d05fad83 Mon Sep 17 00:00:00 2001
From: SR4ven <46794237+SR4ven@users.noreply.github.com>
Date: Wed, 22 May 2019 13:20:54 +0200
Subject: [PATCH 5/5] Removed py38 check from tox

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

diff --git a/tox.ini b/tox.ini
index f5ee2a22..a9aa1af4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ envlist =
     py27-{unix,windows}
     py36-{unix,windows}
     py37-{unix,windows}
-    py38-{unix,windows}
 
 [testenv]
 whitelist_externals =