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 01/23] 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 02/23] 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 03/23] 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 04/23] 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:

From 847c81399ece7d613eeb2f899322be1324e590d6 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 15:35:11 +0530
Subject: [PATCH 05/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 64c88347..4dcbdece 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -1,12 +1,19 @@
 language: python
-build_image: shippableimages/ubuntu1204_python
+#build_image: shippableimages/ubuntu1204_python
+
+env: 
+  - FOO=ree BAR=test
+  - REE=foo TEST=bar
+
 python:
   - 2.6
   - 2.7
   - 3.2
   - 3.3
   - 3.4
+  - 3.5
   - pypy
+  - pypy3
 
 install:
   - pip install -r requirements.txt
@@ -23,4 +30,4 @@ script:
 
 notifications:
   email:
-   - exampleone@org.com
+   - shiphitchcock1@gmail.com

From 74578278d3f0c4874de7623c538b701dc828589e Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 15:46:45 +0530
Subject: [PATCH 06/23] Update shippable.yml

---
 shippable.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 4dcbdece..8a310998 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -2,8 +2,9 @@ language: python
 #build_image: shippableimages/ubuntu1204_python
 
 env: 
-  - FOO=ree BAR=test
-  - REE=foo TEST=bar
+  global:
+    - FOO=ree BAR=test
+    - REE=foo TEST=bar
 
 python:
   - 2.6
@@ -27,6 +28,10 @@ script:
   - which python
   - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
   - coverage xml -o shippable/codecoverage/coverage.xml
+  - echo "$FOO"
+  - echo "$BAR"
+  - echo "$REE"
+  - echo "$TEST"
 
 notifications:
   email:

From de3c91850aabd3e542490e4c6686afeb2cdced2e Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 15:59:07 +0530
Subject: [PATCH 07/23] Update shippable.yml

---
 shippable.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 8a310998..ba6ea005 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -2,9 +2,9 @@ language: python
 #build_image: shippableimages/ubuntu1204_python
 
 env: 
-  global:
-    - FOO=ree BAR=test
-    - REE=foo TEST=bar
+  #global:
+   # - FOO=ree BAR=test
+  - REE=foo TEST=bar
 
 python:
   - 2.6

From 0f33bc25ef79fdb20eefd05fc0162f724fdba230 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 16:06:14 +0530
Subject: [PATCH 08/23] Update shippable.yml

---
 shippable.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/shippable.yml b/shippable.yml
index ba6ea005..a31e9238 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -5,6 +5,13 @@ env:
   #global:
    # - FOO=ree BAR=test
   - REE=foo TEST=bar
+  
+matrix:
+  include:
+    - python: 3.4
+      env: FOO=ree BAR=test
+  exclude:
+    - python: 3.2
 
 python:
   - 2.6

From 3f26dec3e01f51198322331c32cd9c67bd7f4604 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 16:27:46 +0530
Subject: [PATCH 09/23] Update shippable.yml

---
 shippable.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index a31e9238..48de9377 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -7,20 +7,17 @@ env:
   - REE=foo TEST=bar
   
 matrix:
-  include:
-    - python: 3.4
-      env: FOO=ree BAR=test
-  exclude:
-    - python: 3.2
+  - FOO=ree
+  - BAR=test
 
 python:
   - 2.6
   - 2.7
-  - 3.2
+  #- 3.2
   - 3.3
   - 3.4
   - 3.5
-  - pypy
+  #- pypy
   - pypy3
 
 install:

From 01e464fa8512cd6e00ba73b0c3944dad6797b430 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 18:08:52 +0530
Subject: [PATCH 10/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 48de9377..60b04ac1 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -2,8 +2,6 @@ language: python
 #build_image: shippableimages/ubuntu1204_python
 
 env: 
-  #global:
-   # - FOO=ree BAR=test
   - REE=foo TEST=bar
   
 matrix:
@@ -13,11 +11,11 @@ matrix:
 python:
   - 2.6
   - 2.7
-  #- 3.2
+  - 3.2
   - 3.3
   - 3.4
   - 3.5
-  #- pypy
+  - pypy
   - pypy3
 
 install:

From 8310a9485499f9dd2e0f387040c61a4e7b6aa876 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 18:20:59 +0530
Subject: [PATCH 11/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 60b04ac1..389e1228 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -37,4 +37,4 @@ script:
 
 notifications:
   email:
-   - shiphitchcock1@gmail.com
+   - shiphitchcock1@gmail.com   

From 359280cc20f73c8eb53f6a0eefc5bf6e3ef43840 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 18:24:28 +0530
Subject: [PATCH 12/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 389e1228..44901aa3 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -5,8 +5,7 @@ env:
   - REE=foo TEST=bar
   
 matrix:
-  - FOO=ree
-  - BAR=test
+  - FOO=ree BAR=test
 
 python:
   - 2.6

From 8b4db225bd5fdbd0a63bf6c379329a1445baac17 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 18:30:48 +0530
Subject: [PATCH 13/23] Update shippable.yml

---
 shippable.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shippable.yml b/shippable.yml
index 44901aa3..18a3b543 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -5,7 +5,9 @@ env:
   - REE=foo TEST=bar
   
 matrix:
-  - FOO=ree BAR=test
+  include:
+    python: 3.3
+    env: FOO=ree BAR=test
 
 python:
   - 2.6

From e337cec4747519eecc5b449ef2d9d8f0909cab63 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Fri, 19 Feb 2016 18:46:09 +0530
Subject: [PATCH 14/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 18a3b543..b368c002 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -38,4 +38,4 @@ script:
 
 notifications:
   email:
-   - shiphitchcock1@gmail.com   
+   - shiphitchcock1@gmail.com      

From 76b3cd3d8c525c6bc0405da1bca6405fcc9ef61c Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Sat, 20 Feb 2016 14:21:43 +0530
Subject: [PATCH 15/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index b368c002..687ecd4a 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -6,8 +6,8 @@ env:
   
 matrix:
   include:
-    python: 3.3
-    env: FOO=ree BAR=test
+    - python: 3.3
+      env: FOO=ree BAR=test
 
 python:
   - 2.6

From d1c8da8a1c439bebc2c3bd2d506df385f392c038 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Mon, 22 Feb 2016 16:30:47 +0530
Subject: [PATCH 16/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 687ecd4a..49c6d3e2 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -38,4 +38,4 @@ script:
 
 notifications:
   email:
-   - shiphitchcock1@gmail.com      
+   - shiphitchcock1@gmail.com        

From 78e0eb161aa90a489c0a1ef65b7f3241252cca60 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Mon, 22 Feb 2016 16:46:57 +0530
Subject: [PATCH 17/23] Update shippable.yml

---
 shippable.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 49c6d3e2..e105cd24 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -11,12 +11,12 @@ matrix:
 
 python:
   - 2.6
-  - 2.7
+#  - 2.7
   - 3.2
   - 3.3
-  - 3.4
+#  - 3.4
   - 3.5
-  - pypy
+#  - pypy
   - pypy3
 
 install:

From e6bac0f68cea457de6951820f9f526d065bb4085 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Mon, 22 Feb 2016 17:35:02 +0530
Subject: [PATCH 18/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index e105cd24..e5da80f1 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -38,4 +38,4 @@ script:
 
 notifications:
   email:
-   - shiphitchcock1@gmail.com        
+   - shiphitchcock1@gmail.com           

From 6bc4551d06d8d78bf371bb730c33cf866891df05 Mon Sep 17 00:00:00 2001
From: shiphitchcock1 <shiphitchcock1@gmail.com>
Date: Thu, 21 Apr 2016 18:46:31 +0530
Subject: [PATCH 19/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index e5da80f1..b4e033f5 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -39,3 +39,4 @@ script:
 notifications:
   email:
    - shiphitchcock1@gmail.com           
+  

From 962948d2a1fec14402de526827efb7961b6de895 Mon Sep 17 00:00:00 2001
From: chetantarale <chetan@shippable.com>
Date: Mon, 28 Nov 2016 15:33:47 +0530
Subject: [PATCH 20/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index b4e033f5..53283eaf 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -29,6 +29,7 @@ before_script:
 
 script:
   - which python
+  - cat shippable/testresults/nosetests.xml
   - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
   - coverage xml -o shippable/codecoverage/coverage.xml
   - echo "$FOO"

From 9ed5683606fcc1943abeae41140fd60888efdc4c Mon Sep 17 00:00:00 2001
From: chetantarale <chetan@shippable.com>
Date: Mon, 28 Nov 2016 15:35:59 +0530
Subject: [PATCH 21/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 53283eaf..b4e033f5 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -29,7 +29,6 @@ before_script:
 
 script:
   - which python
-  - cat shippable/testresults/nosetests.xml
   - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
   - coverage xml -o shippable/codecoverage/coverage.xml
   - echo "$FOO"

From 290ce0542d6e3ae71cedf8d2b2d721a015105d4b Mon Sep 17 00:00:00 2001
From: chetantarale <chetan@shippable.com>
Date: Mon, 28 Nov 2016 15:42:07 +0530
Subject: [PATCH 22/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index b4e033f5..4fba91e3 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -30,6 +30,7 @@ before_script:
 script:
   - which python
   - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
+  - cat shippable/codecoverage/coverage.xml
   - coverage xml -o shippable/codecoverage/coverage.xml
   - echo "$FOO"
   - echo "$BAR"

From 9a1dfb20db89215c5a93021055ba5c04b64606d5 Mon Sep 17 00:00:00 2001
From: chetantarale <chetan@shippable.com>
Date: Mon, 28 Nov 2016 15:43:32 +0530
Subject: [PATCH 23/23] Update shippable.yml

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

diff --git a/shippable.yml b/shippable.yml
index 4fba91e3..b4e033f5 100755
--- a/shippable.yml
+++ b/shippable.yml
@@ -30,7 +30,6 @@ before_script:
 script:
   - which python
   - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml
-  - cat shippable/codecoverage/coverage.xml
   - coverage xml -o shippable/codecoverage/coverage.xml
   - echo "$FOO"
   - echo "$BAR"