From 0fdcf28809eb639d14e2b5fd3c0f99b038731714 Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 13:35:53 -0600
Subject: [PATCH 1/8] Limit CI build branch

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

diff --git a/.travis.yml b/.travis.yml
index 53b1684..b5db887 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,7 @@ env:
 
 branches:
     only:
-    - master
-    - develop
+    - nocarryr-develop
 
 install: pip install --quiet --use-mirrors tox
 

From d012f10218fd8fea137bb2d676883f6d5e1ffc39 Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 13:39:19 -0600
Subject: [PATCH 2/8] Set 'report' directive to 'include'

Conflicts:
	.coveragerc
---
 .coveragerc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.coveragerc b/.coveragerc
index d80d81c..352b218 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,5 @@
 [report]
-source=django_markdown
+include = django_markdown
 
 [run]
 source=django_markdown

From 879faac5338ef536c0e791ebf41642fd6570d207 Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 13:48:18 -0600
Subject: [PATCH 3/8] Set ignore_errors to 'True' in coverage.py reports

---
 .coveragerc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.coveragerc b/.coveragerc
index 352b218..3cf476c 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,6 @@
 [report]
 include = django_markdown
+ignore_errors = True
 
 [run]
 source=django_markdown

From 3de426a11495aa0c33e15b355253cacb1e5fe89e Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 14:33:31 -0600
Subject: [PATCH 4/8] Remove report config from coveragerc for now

---
 .coveragerc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 3cf476c..909a803 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,2 @@
-[report]
-include = django_markdown
-ignore_errors = True
-
 [run]
 source=django_markdown

From 345808a23a70eae6ee90a7bb13bd1c2614c2f2e7 Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 14:38:03 -0600
Subject: [PATCH 5/8] Remove CI build branch restrictions

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

diff --git a/.travis.yml b/.travis.yml
index b5db887..a05af5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,6 @@ env:
 - TOXENV=py34-d17
 - TOXENV=cov
 
-branches:
-    only:
-    - nocarryr-develop
-
 install: pip install --quiet --use-mirrors tox
 
 script: tox

From 96ba1f81bd6c60d28345ba02eee28105adaef064 Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 14:59:36 -0600
Subject: [PATCH 6/8] Add python 3.4 to travis.yml for the py34-d17 test in tox

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

diff --git a/.travis.yml b/.travis.yml
index a05af5f..5a72cd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 
 python:
 - "2.7"
+- "3.4"
 
 env:
 - TOXENV=py27-d16

From 0613e3950503bef664a1f80c1abf3e58ee0eb1c3 Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 15:10:16 -0600
Subject: [PATCH 7/8] Remove python version specific tests in tox.ini since
 Travis CI is already testing across both 2.7 and 3.4

---
 tox.ini | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/tox.ini b/tox.ini
index b0df3bd..2fc7061 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py27-d16,py27-d17,py34-d17,cov
+envlist=d16,d17,cov
 
 [pylama]
 skip=example/*
@@ -26,24 +26,18 @@ commands=py.test
 deps =
     pytest
 
-[testenv:py27-d16]
+[testenv:d16]
 basepython = python2.7
 deps =
     django==1.6.7
     {[testenv]deps}
 
-[testenv:py27-d17]
+[testenv:d17]
 basepython = python2.7
 deps =
     django==1.7
     {[testenv]deps}
 
-[testenv:py34-d17]
-basepython = python3.4
-deps =
-    django==1.7
-    {[testenv]deps}
-
 [testenv:cov]
 deps =
     coverage

From 8b2b69c41e3f4df0c70d8a7b9378c5f6f1d30cf8 Mon Sep 17 00:00:00 2001
From: nocarryr <matt@nomadic-recording.com>
Date: Sun, 13 Dec 2015 15:12:09 -0600
Subject: [PATCH 8/8] Modify travis.yml to reflect changes from 0613e39

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

diff --git a/.travis.yml b/.travis.yml
index 5a72cd5..0f1e396 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,8 @@ python:
 - "3.4"
 
 env:
-- TOXENV=py27-d16
-- TOXENV=py27-d17
-- TOXENV=py34-d17
+- TOXENV=d16
+- TOXENV=d17
 - TOXENV=cov
 
 install: pip install --quiet --use-mirrors tox