From e1b3b7a0adaf4d2e98eefb50b6ee9f305fb6efd4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 1 Jul 2014 11:45:58 +0530 Subject: [PATCH 01/13] 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/13] 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/13] 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/13] 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 11843bf84494fbe38cd64b80a3181292640bfe99 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Mon, 12 Oct 2015 13:49:25 +0530 Subject: [PATCH 05/13] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 64c88347..1745635c 100755 --- a/shippable.yml +++ b/shippable.yml @@ -23,4 +23,4 @@ script: notifications: email: - - exampleone@org.com + - vidya@shippable.com From 7fc64612d16e5426bd0acb6fa2d9713a160b4871 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Mon, 12 Oct 2015 14:03:08 +0530 Subject: [PATCH 06/13] Update shippable.yml --- shippable.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index 1745635c..2c74cfe4 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 ae52463831d3405179485dc06d79a19543025492 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 24 Nov 2015 20:20:56 +0530 Subject: [PATCH 07/13] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 2c74cfe4..24ac7e82 100755 --- a/shippable.yml +++ b/shippable.yml @@ -8,6 +8,7 @@ python: #- 3.4 #- pypy + install: - pip install -r requirements.txt From 5f33390fc2cd65b18845012c88d45b7314f8a08b Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 24 Nov 2015 20:22:43 +0530 Subject: [PATCH 08/13] [reset_minion] --- shippable.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 24ac7e82..e1703ad0 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,14 +1,15 @@ language: python build_image: shippableimages/ubuntu1204_python python: - - 2.6 - # - 2.7 + # - 2.6 + - 2.7 #- 3.2 #- 3.3 #- 3.4 #- pypy + install: - pip install -r requirements.txt From 3e47e9165976c604b86d1198878a8e7edc20a19a Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 24 Nov 2015 20:25:09 +0530 Subject: [PATCH 09/13] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index e1703ad0..661f5b04 100755 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,6 @@ python: #- pypy - install: - pip install -r requirements.txt From 19628bfa7030b66bf9576556bd2593345530de81 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 24 Nov 2015 21:16:11 +0530 Subject: [PATCH 10/13] Update shippable.yml --- shippable.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 661f5b04..aad4b0ff 100755 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,9 @@ python: #- 3.3 #- 3.4 #- pypy - +env: + - secure: O6dIGbm1+lZkEN8ZQ3bqB2fSx/MlFguTlnkjmFtTRT4XqF87nZFmhiEXpzzSpN/+dk/qy3cwYZdeM2W3bNxicFWx3pbJZaH0NT3I+TCGSgnf4w5GRl1PVQ3/8H6LdZRWA6g6pQaE9lJ3Qr1YzasRUCuXiHYLHs187y/KLQAhnfBoUnSzXEgW5xN+BqxtMGlB6M/dzSUyDuHb5EtJDMqTYpcJ7yVOjdSy4548kJKVY5izrjuQpOztdErK/H8MFhr5Vm6rN4kbdWhOefgYPD6xihGnn/MYOJERf+nfhQXLOMNSD4ELiYF/2jEQ0FASBZuzXOfb7NJkYj5LCrN9Hw3EpQ== + install: - pip install -r requirements.txt @@ -16,6 +18,7 @@ install: before_script: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage + - echo $key2 script: - which python From 06a3407d9971f6c4dbe531566622785324764546 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 24 Nov 2015 21:16:35 +0530 Subject: [PATCH 11/13] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index aad4b0ff..00bac2a6 100755 --- a/shippable.yml +++ b/shippable.yml @@ -8,6 +8,7 @@ python: #- 3.4 #- pypy env: + global: - secure: O6dIGbm1+lZkEN8ZQ3bqB2fSx/MlFguTlnkjmFtTRT4XqF87nZFmhiEXpzzSpN/+dk/qy3cwYZdeM2W3bNxicFWx3pbJZaH0NT3I+TCGSgnf4w5GRl1PVQ3/8H6LdZRWA6g6pQaE9lJ3Qr1YzasRUCuXiHYLHs187y/KLQAhnfBoUnSzXEgW5xN+BqxtMGlB6M/dzSUyDuHb5EtJDMqTYpcJ7yVOjdSy4548kJKVY5izrjuQpOztdErK/H8MFhr5Vm6rN4kbdWhOefgYPD6xihGnn/MYOJERf+nfhQXLOMNSD4ELiYF/2jEQ0FASBZuzXOfb7NJkYj5LCrN9Hw3EpQ== From 1844f44501468216e451dd22402dd7d055a1e444 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 24 Nov 2015 21:17:22 +0530 Subject: [PATCH 12/13] Update shippable.yml --- shippable.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 00bac2a6..e81934a5 100755 --- a/shippable.yml +++ b/shippable.yml @@ -9,8 +9,10 @@ python: #- pypy env: global: - - secure: O6dIGbm1+lZkEN8ZQ3bqB2fSx/MlFguTlnkjmFtTRT4XqF87nZFmhiEXpzzSpN/+dk/qy3cwYZdeM2W3bNxicFWx3pbJZaH0NT3I+TCGSgnf4w5GRl1PVQ3/8H6LdZRWA6g6pQaE9lJ3Qr1YzasRUCuXiHYLHs187y/KLQAhnfBoUnSzXEgW5xN+BqxtMGlB6M/dzSUyDuHb5EtJDMqTYpcJ7yVOjdSy4548kJKVY5izrjuQpOztdErK/H8MFhr5Vm6rN4kbdWhOefgYPD6xihGnn/MYOJERf+nfhQXLOMNSD4ELiYF/2jEQ0FASBZuzXOfb7NJkYj5LCrN9Hw3EpQ== - + - secure: O6dIGbm1+lZkEN8ZQ3bqB2fSx/MlFguTlnkjmFtTRT4XqF87nZFmhiEXpzzSpN/+dk/qy3cwYZdeM2W3bNxicFWx3pbJZaH0NT3I+TCGSgnf4w5GRl1PVQ3/8H6LdZRWA6g6pQaE9lJ3Qr1YzasRUCuXiHYLHs187y/KLQAhnfBoUnSzXEgW5xN+BqxtMGlB6M/dzSUyDuHb5EtJDMqTYpcJ7yVOjdSy4548kJKVY5izrjuQpOztdErK/H8MFhr5Vm6rN4kbdWhOefgYPD6xihGnn/MYOJERf+nfhQXLOMNSD4ELiYF/2jEQ0FASBZuzXOfb7NJkYj5LCrN9Hw3EpQ== + matrix: + - Foo=abr + - qq=qww install: - pip install -r requirements.txt From 049309643eb7701f21718830c50297d667aba7df Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 24 Nov 2015 21:17:53 +0530 Subject: [PATCH 13/13] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index e81934a5..54532ec3 100755 --- a/shippable.yml +++ b/shippable.yml @@ -8,9 +8,9 @@ python: #- 3.4 #- pypy env: - global: - - secure: O6dIGbm1+lZkEN8ZQ3bqB2fSx/MlFguTlnkjmFtTRT4XqF87nZFmhiEXpzzSpN/+dk/qy3cwYZdeM2W3bNxicFWx3pbJZaH0NT3I+TCGSgnf4w5GRl1PVQ3/8H6LdZRWA6g6pQaE9lJ3Qr1YzasRUCuXiHYLHs187y/KLQAhnfBoUnSzXEgW5xN+BqxtMGlB6M/dzSUyDuHb5EtJDMqTYpcJ7yVOjdSy4548kJKVY5izrjuQpOztdErK/H8MFhr5Vm6rN4kbdWhOefgYPD6xihGnn/MYOJERf+nfhQXLOMNSD4ELiYF/2jEQ0FASBZuzXOfb7NJkYj5LCrN9Hw3EpQ== matrix: + - secure: O6dIGbm1+lZkEN8ZQ3bqB2fSx/MlFguTlnkjmFtTRT4XqF87nZFmhiEXpzzSpN/+dk/qy3cwYZdeM2W3bNxicFWx3pbJZaH0NT3I+TCGSgnf4w5GRl1PVQ3/8H6LdZRWA6g6pQaE9lJ3Qr1YzasRUCuXiHYLHs187y/KLQAhnfBoUnSzXEgW5xN+BqxtMGlB6M/dzSUyDuHb5EtJDMqTYpcJ7yVOjdSy4548kJKVY5izrjuQpOztdErK/H8MFhr5Vm6rN4kbdWhOefgYPD6xihGnn/MYOJERf+nfhQXLOMNSD4ELiYF/2jEQ0FASBZuzXOfb7NJkYj5LCrN9Hw3EpQ== + global: - Foo=abr - qq=qww