From e1b3b7a0adaf4d2e98eefb50b6ee9f305fb6efd4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 1 Jul 2014 11:45:58 +0530 Subject: [PATCH 01/31] 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 Date: Tue, 22 Jul 2014 11:48:12 -0700 Subject: [PATCH 02/31] 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 Date: Thu, 16 Oct 2014 12:29:57 -0700 Subject: [PATCH 03/31] 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 Date: Thu, 25 Jun 2015 10:15:14 -0500 Subject: [PATCH 04/31] 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 71a55b9831c375b66e9baf3194cc7e5bf0e7eb22 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 12 Oct 2015 13:53:42 +0530 Subject: [PATCH 05/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 64c88347..d1bc837b 100755 --- a/shippable.yml +++ b/shippable.yml @@ -23,4 +23,4 @@ script: notifications: email: - - exampleone@org.com + - varsha@shippable.com From 82ec07eb080d87c19a750df201d17fbf089d0d1c Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 12 Oct 2015 14:04:05 +0530 Subject: [PATCH 06/31] Update shippable.yml --- shippable.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index d1bc837b..108d9163 100755 --- a/shippable.yml +++ b/shippable.yml @@ -2,11 +2,11 @@ language: python build_image: shippableimages/ubuntu1204_python python: - 2.6 - - 2.7 - - 3.2 - - 3.3 - - 3.4 - - pypy + #- 2.7 + #- 3.2 + #- 3.3 + #- 3.4 + #- pypy install: - pip install -r requirements.txt From d2bb65f1c30c95a072cd2efdb5c9ebc2753a5284 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 12 Oct 2015 15:58:50 +0530 Subject: [PATCH 07/31] changed from 61 to 62 --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index e090dee3..89d6d59f 100755 --- a/test.py +++ b/test.py @@ -6,7 +6,7 @@ class TestSuite(unittest.TestCase): def test(self): app = App() app.calculate() - self.failIf(app.retrieve() != 62) + self.failIf(app.retrieve() != 61) def main(): From 74235de0e1a22b04de104dea1cb1fbd3d7c9d665 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 12 Oct 2015 16:47:23 +0530 Subject: [PATCH 08/31] Update shippable.yml --- shippable.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shippable.yml b/shippable.yml index 108d9163..4745c45e 100755 --- a/shippable.yml +++ b/shippable.yml @@ -20,6 +20,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 + # exclude +branches: + except: + - TEST notifications: email: From a6ccf19eaaa13396f4e968e2f991b283df3e9c16 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 12 Oct 2015 16:50:07 +0530 Subject: [PATCH 09/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 4745c45e..2a7a964f 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,7 +22,7 @@ script: - coverage xml -o shippable/codecoverage/coverage.xml # exclude branches: - except: + only: - TEST notifications: From f23593385fa010b83f8a4c2297e7eb0d2ac478a5 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 26 Oct 2015 12:58:17 +0530 Subject: [PATCH 10/31] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 108d9163..b0a9b01a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -24,3 +24,5 @@ script: notifications: email: - varsha@shippable.com + +archive: true From f5f5b589d5c2089c00db96cf7a1d3e802b294ae5 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 26 Oct 2015 13:01:23 +0530 Subject: [PATCH 11/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index b0a9b01a..767ddbd7 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,4 @@ notifications: email: - varsha@shippable.com -archive: true +#archive: true From 943eff2b52306a53bf8fa5afc0a6ef3a929cc081 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Tue, 27 Oct 2015 17:32:38 +0530 Subject: [PATCH 12/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 767ddbd7..b0a9b01a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,4 @@ notifications: email: - varsha@shippable.com -#archive: true +archive: true From 7ba12a4718a8f9bcc26be5feb4ac570f9987a2cf Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 11:35:08 +0530 Subject: [PATCH 13/31] Update shippable.yml --- shippable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index b0a9b01a..7ac3b559 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,7 +22,6 @@ script: - coverage xml -o shippable/codecoverage/coverage.xml notifications: - email: - - varsha@shippable.com + email: false archive: true From c8b8598293eb67513ee1a88cfcdf6d1c9145fa9d Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 11:58:17 +0530 Subject: [PATCH 14/31] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 5280f829..ea1968a8 100755 --- a/shippable.yml +++ b/shippable.yml @@ -29,3 +29,5 @@ notifications: email: false archive: true + +cache: true From ebf28587fcae0aff55314e79be6fe7b07f5d5906 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 12:03:52 +0530 Subject: [PATCH 15/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index ea1968a8..f553c56f 100755 --- a/shippable.yml +++ b/shippable.yml @@ -30,4 +30,4 @@ notifications: archive: true -cache: true +#cache: true From a3f44ab023bda55f07636f5936457b7a61472293 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 12:10:56 +0530 Subject: [PATCH 16/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index f553c56f..ea1968a8 100755 --- a/shippable.yml +++ b/shippable.yml @@ -30,4 +30,4 @@ notifications: archive: true -#cache: true +cache: true From c9210afd733e551b737c2183e28e7086299a876e Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 12:11:57 +0530 Subject: [PATCH 17/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index f553c56f..ea1968a8 100755 --- a/shippable.yml +++ b/shippable.yml @@ -30,4 +30,4 @@ notifications: archive: true -#cache: true +cache: true From 78f3de7d2c2af8959fced7322207fa86ed759871 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 12:15:45 +0530 Subject: [PATCH 18/31] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index ea1968a8..11af3427 100755 --- a/shippable.yml +++ b/shippable.yml @@ -26,7 +26,8 @@ branches: - TEST notifications: - email: false + email: + varsha@shippable.com archive: true From 752c1a572e2a6e529d3e2bc0252387069a1d2245 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 12:22:27 +0530 Subject: [PATCH 19/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 11af3427..d38e0457 100755 --- a/shippable.yml +++ b/shippable.yml @@ -31,4 +31,4 @@ notifications: archive: true -cache: true +#cache: true From e77caa8aebf92dc617dd8630abd23d5e65268142 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Fri, 30 Oct 2015 12:31:50 +0530 Subject: [PATCH 20/31] Update shippable.yml --- shippable.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index d38e0457..a7cf9828 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,9 +21,8 @@ script: - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - coverage xml -o shippable/codecoverage/coverage.xml # exclude -branches: - only: - - TEST +#branches: + # - TEST notifications: email: From f256d8e7e87e82282d2645c6ceba20db142564f6 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Mon, 23 Nov 2015 12:59:48 +0530 Subject: [PATCH 21/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 3c396c63..a7cf9828 100755 --- a/shippable.yml +++ b/shippable.yml @@ -30,4 +30,4 @@ notifications: archive: true -cache: true +#cache: true From 6d5c11fa0387309135049557241929cd1c68aee9 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Thu, 17 Dec 2015 17:06:26 +0530 Subject: [PATCH 22/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a7cf9828..3bdef75f 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,5 @@ language: python -build_image: shippableimages/ubuntu1204_python +build_image: drydock/u12pyt:tip python: - 2.6 #- 2.7 From d29785c0b83d492217ac36ff4cd94adf339aedcc Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Thu, 17 Dec 2015 17:14:34 +0530 Subject: [PATCH 23/31] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 89d6d59f..e090dee3 100755 --- a/test.py +++ b/test.py @@ -6,7 +6,7 @@ class TestSuite(unittest.TestCase): def test(self): app = App() app.calculate() - self.failIf(app.retrieve() != 61) + self.failIf(app.retrieve() != 62) def main(): From 70457a5160a0dd4161206ee28fa67199a4d22df7 Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Thu, 17 Dec 2015 17:20:16 +0530 Subject: [PATCH 24/31] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 3bdef75f..f05d387c 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,8 +1,8 @@ language: python -build_image: drydock/u12pyt:tip +build_image: drydock/u12pytall:tip python: - 2.6 - #- 2.7 + - 2.7 #- 3.2 #- 3.3 #- 3.4 From 1f54567254e735a51ca76164282d91c036c03b2d Mon Sep 17 00:00:00 2001 From: Varsha-Arun Date: Thu, 17 Dec 2015 17:37:46 +0530 Subject: [PATCH 25/31] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index f05d387c..03cabafe 100755 --- a/shippable.yml +++ b/shippable.yml @@ -29,5 +29,4 @@ notifications: varsha@shippable.com archive: true - #cache: true From 80e0b34a50d7d88c528103f1f5c5a6f86dbc4841 Mon Sep 17 00:00:00 2001 From: ci-test2 Date: Thu, 7 Jan 2016 10:40:28 +0530 Subject: [PATCH 26/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 03cabafe..83a6662a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,5 @@ language: python -build_image: drydock/u12pytall:tip +build_image: drydock/u12pyt:tip python: - 2.6 - 2.7 From 079eb6d4445864a628e0dfe4f067914333587e1a Mon Sep 17 00:00:00 2001 From: ci-test2 Date: Mon, 18 Jan 2016 12:19:03 +0530 Subject: [PATCH 27/31] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 83a6662a..6900dd8d 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,7 +1,7 @@ language: python -build_image: drydock/u12pyt:tip +#build_image: drydock/u12pyt:tip python: - - 2.6 + # - 2.6 - 2.7 #- 3.2 #- 3.3 From 12c00a14943a562d57aa965293faab043be259e0 Mon Sep 17 00:00:00 2001 From: ci-test2 Date: Tue, 19 Jan 2016 13:17:19 +0530 Subject: [PATCH 28/31] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0f675189..2a282d12 100755 --- a/README.md +++ b/README.md @@ -4,3 +4,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. + +[![Build Status](https://apibeta.shippable.com/projects/5673b2c81895ca4474669428/badge/master)](https://beta.shippable.com/projects/5673b2c81895ca4474669428) From 066b29dab585cffdeefea6087070952c1ab7e544 Mon Sep 17 00:00:00 2001 From: ci-test2 Date: Wed, 20 Jan 2016 11:46:27 +0530 Subject: [PATCH 29/31] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 6900dd8d..cbb45280 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,5 @@ language: python -#build_image: drydock/u12pyt:tip + python: # - 2.6 - 2.7 From e3a6347e69e81543a4d5133b59ae2c3f9c88dd95 Mon Sep 17 00:00:00 2001 From: ci-test2 Date: Wed, 20 Jan 2016 11:51:00 +0530 Subject: [PATCH 30/31] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index cbb45280..427f126b 100755 --- a/shippable.yml +++ b/shippable.yml @@ -3,8 +3,8 @@ language: python python: # - 2.6 - 2.7 - #- 3.2 - #- 3.3 + - 3.2 + - 3.3 #- 3.4 #- pypy From 5a55601d4afec3b8f1c646c62c806649e9f46af1 Mon Sep 17 00:00:00 2001 From: ci-test2 Date: Tue, 26 Jan 2016 10:39:21 +0530 Subject: [PATCH 31/31] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 427f126b..9c472f6a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -27,6 +27,7 @@ script: notifications: email: varsha@shippable.com + irc: "chat.freenode.net#test-irc" archive: true #cache: true