From e1b3b7a0adaf4d2e98eefb50b6ee9f305fb6efd4 Mon Sep 17 00:00:00 2001
From: Vidya Raghavan <vidya@shippable.com>
Date: Tue, 1 Jul 2014 11:45:58 +0530
Subject: [PATCH 1/4] Update shippable.yml

---
 shippable.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 3bdcdf82..34e81b8e 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -1,8 +1,13 @@
 language: python
 
 python:
+  - 2.6
   - 2.7
-
+  - 3.2
+  - 3.3
+  - 3.4
+  - pypy
+  
 install:
   - pip install -r requirements.txt
 
@@ -14,4 +19,8 @@ before_script:
 script:
   - nosetests test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
   - which python && coverage run --branch test.py
-  - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py
\ No newline at end of file
+  - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py
+
+notifications:
+  email:
+   - exampleone@org.com

From de9d2fdb6383dbaa8cf63b4c5897b1fa5ea68b71 Mon Sep 17 00:00:00 2001
From: Patrick Ellis <oneredoak@gmail.com>
Date: Tue, 22 Jul 2014 11:48:12 -0700
Subject: [PATCH 2/4] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ec522d27..0f675189 100755
--- a/README.md
+++ b/README.md
@@ -2,3 +2,5 @@ Python Sample
 =====================
 
 Simple Python sample with tests using Nose and Coverage.
+
+This sample is built for Shippable, a docker based continuous integration and deployment platform.

From bbf732f772dfa47312784cc11d1a262d5a8fd2ac Mon Sep 17 00:00:00 2001
From: ragsden <raghu@shippable.com>
Date: Thu, 16 Oct 2014 12:29:57 -0700
Subject: [PATCH 3/4] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 34e81b8e..eda56114 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -1,5 +1,5 @@
 language: python
-
+build_image: shippableimages/ubuntu1204_python
 python:
   - 2.6
   - 2.7

From 087c930c418ea0aa9410a48ac5cf594ebf89efd1 Mon Sep 17 00:00:00 2001
From: Brent O'Connor <epicserve@gmail.com>
Date: Thu, 25 Jun 2015 10:15:14 -0500
Subject: [PATCH 4/4] Fixed tests getting run twice

Currently tests are getting run twice, when they only need to be run once. I also added .coveragerc file to control coverage settings.
---
 .coveragerc   | 9 +++++++++
 .gitignore    | 2 ++
 shippable.yml | 8 ++++----
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 .coveragerc
 create mode 100644 .gitignore

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..34a1bebf
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,9 @@
+# .coveragerc to control coverage
+
+[run]
+branch = True
+
+source = .
+
+[html]
+directory = htmlcov
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..89437a9d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.coverage
+shippable/
diff --git a/shippable.yml b/shippable.yml
index eda56114..64c88347 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -7,7 +7,7 @@ python:
   - 3.3
   - 3.4
   - pypy
-  
+
 install:
   - pip install -r requirements.txt
 
@@ -17,9 +17,9 @@ before_script:
   - mkdir -p shippable/codecoverage
 
 script:
-  - nosetests test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
-  - which python && coverage run --branch test.py
-  - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py
+  - which python
+  - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
+  - coverage xml -o shippable/codecoverage/coverage.xml
 
 notifications:
   email: