From 0cb183293bd89c65b7ed50f4e8ad19115d6ec882 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 10 Sep 2014 18:01:20 -0700 Subject: [PATCH 01/19] Update shippable.yml --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 34e81b8e..a3d4de86 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,6 +21,6 @@ script: - which python && coverage run --branch test.py - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py -notifications: - email: - - exampleone@org.com +notifications: false + +upload: true From eb4f3a6c5733fb90689d8a2556f484b485866ea4 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 10 Sep 2014 18:04:10 -0700 Subject: [PATCH 02/19] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a3d4de86..1aecd89b 100755 --- a/shippable.yml +++ b/shippable.yml @@ -23,4 +23,4 @@ script: notifications: false -upload: true +archive: true From bec7e7ad34c74c3364b2a44164044cbdb993b669 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 12:04:46 -0700 Subject: [PATCH 03/19] Update shippable.yml --- shippable.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 1aecd89b..a417519e 100755 --- a/shippable.yml +++ b/shippable.yml @@ -23,4 +23,6 @@ script: notifications: false -archive: true +branches: + only: + - master From ab30716c5e75bd95d0207d7c29ac0caba95adcf9 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 26 Sep 2014 13:31:59 -0700 Subject: [PATCH 04/19] Update shippable.yml --- shippable.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a417519e..11cd7732 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,7 +21,9 @@ script: - which python && coverage run --branch test.py - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py -notifications: false +notifications: + email: + on_success: always branches: only: From 4855ba7b53ba414feeab5325e1c108a473c998e0 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 7 Oct 2014 12:50:44 -0700 Subject: [PATCH 05/19] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 11cd7732..52e2bcd1 100755 --- a/shippable.yml +++ b/shippable.yml @@ -28,3 +28,5 @@ notifications: branches: only: - master + +cache: true From 1ad561172436d976f7c63f929fb76c8f67347d8c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 12 Dec 2014 11:28:20 -0800 Subject: [PATCH 06/19] [reset_minion] --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 52e2bcd1..1d77861f 100755 --- a/shippable.yml +++ b/shippable.yml @@ -30,3 +30,4 @@ branches: - master cache: true + From f38473eeccc80e2386f3a2bc4e4a61acbeb520c5 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 12 Dec 2014 11:35:46 -0800 Subject: [PATCH 07/19] [reset_minion] --- shippable.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index 1d77861f..e0d74e44 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,12 +1,7 @@ language: python python: - - 2.6 - 2.7 - - 3.2 - - 3.3 - - 3.4 - - pypy install: - pip install -r requirements.txt From 03e58299a19dc18da7031607c70b934c5bebecac Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 12 Dec 2014 11:51:57 -0800 Subject: [PATCH 08/19] [reset_minion] --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index e0d74e44..394c94cc 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,3 @@ branches: - master cache: true - From 071c9bc63adb0fd37f697f8065d2f31a2e7800d7 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 12 Dec 2014 14:25:55 -0800 Subject: [PATCH 09/19] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 394c94cc..4b8397d2 100755 --- a/shippable.yml +++ b/shippable.yml @@ -24,4 +24,6 @@ branches: only: - master + +build_image: shippable/minv2 cache: true From f79ccd69162402b77db35835c2a1d9dcaf05d87f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Sat, 6 Sep 2014 13:15:57 -0700 Subject: [PATCH 10/19] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 4b8397d2..d8178bda 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,4 +1,4 @@ -language: python +language: java python: - 2.7 From cc7bcdd4fa05a600d0f4c249f0d226808f46db28 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 12:36:47 -0700 Subject: [PATCH 11/19] Update shippable.yml --- shippable.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/shippable.yml b/shippable.yml index d8178bda..f38a530a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -20,10 +20,3 @@ notifications: email: on_success: always -branches: - only: - - master - - -build_image: shippable/minv2 -cache: true From 86502d49730649ded663adbabe0f98923f3528f0 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 16:57:31 -0700 Subject: [PATCH 12/19] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index f38a530a..0a284914 100755 --- a/shippable.yml +++ b/shippable.yml @@ -20,3 +20,4 @@ notifications: email: on_success: always + From b8c4a508fb549b74e2fd04b8e1fa8abbb5d386ee Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 3 Mar 2015 17:27:04 -0800 Subject: [PATCH 13/19] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 0a284914..58a8a29f 100755 --- a/shippable.yml +++ b/shippable.yml @@ -6,8 +6,8 @@ python: install: - pip install -r requirements.txt -# Make folders for the reports before_script: + # Make folders for the reports - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From a8e2f1d2767968ac1643b71f7377cab51dbc5818 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 6 Mar 2015 14:08:32 -0800 Subject: [PATCH 14/19] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 58a8a29f..a6b0f735 100755 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,6 @@ install: - pip install -r requirements.txt before_script: - # Make folders for the reports - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 69a2f1a5eb08f0a0887b3e616d01346261f28559 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 6 Mar 2015 16:02:59 -0800 Subject: [PATCH 15/19] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0f675189..8aa82146 100755 --- a/README.md +++ b/README.md @@ -2,5 +2,4 @@ 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 70e4dae65e20696c9aed081444f4b731722d0a0f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 24 Mar 2015 17:06:59 -0700 Subject: [PATCH 16/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8aa82146..6b780b0a 100755 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ 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. +This sample is built for Shippable, a Docker based continuous integration and deployment platform. From 8165b048dd09c8095634ec1875a662e6eeedcada Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 24 Mar 2015 17:09:27 -0700 Subject: [PATCH 17/19] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index e090dee3..803dca24 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() != 63) def main(): From 461c6ef30b2c061ef572ca607373f4b513c1bee5 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 24 Mar 2015 17:20:22 -0700 Subject: [PATCH 18/19] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 803dca24..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() != 63) + self.failIf(app.retrieve() != 62) def main(): From c0fb13722d67fdf6dacc917d577da8c69a412d25 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 29 Apr 2015 14:26:19 -0700 Subject: [PATCH 19/19] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index a6b0f735..041857d6 100755 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,7 @@ install: before_script: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage + - ls script: - nosetests test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml