From e1b3b7a0adaf4d2e98eefb50b6ee9f305fb6efd4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 1 Jul 2014 11:45:58 +0530 Subject: [PATCH 01/17] 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/17] 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/17] 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/17] 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 61d15d61d76c8a1cd7d244a6e7de773cd653fb4d Mon Sep 17 00:00:00 2001 From: harsh157 Date: Wed, 14 Oct 2015 14:52:28 +0530 Subject: [PATCH 05/17] add Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..f9a31301 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM shippable/minv2:latest + +ADD . /home/pyhthon +EXPOSE 50001 \ No newline at end of file From 48c753a3114729a7b325b566b531d10c9a152420 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Wed, 14 Oct 2015 14:58:32 +0530 Subject: [PATCH 06/17] changed shippable yml --- shippable.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 64c88347..dda8d55e 100755 --- a/shippable.yml +++ b/shippable.yml @@ -16,10 +16,7 @@ before_script: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage -script: - - which python - - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - - coverage xml -o shippable/codecoverage/coverage.xml +script: true notifications: email: From 1db903cdcb3906182b90ecb69be53c4b5d0f3721 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Wed, 14 Oct 2015 15:11:19 +0530 Subject: [PATCH 07/17] settings for local server --- Dockerfile | 2 +- shippable.yml | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9a31301..ebb0b5ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM shippable/minv2:latest -ADD . /home/pyhthon +ADD . /home/python EXPOSE 50001 \ No newline at end of file diff --git a/shippable.yml b/shippable.yml index dda8d55e..a64f0a7a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,23 +1,12 @@ language: python build_image: shippableimages/ubuntu1204_python python: - - 2.6 - 2.7 - - 3.2 - - 3.3 - - 3.4 - pypy install: - pip install -r requirements.txt # Make folders for the reports -before_script: - - mkdir -p shippable/testresults - - mkdir -p shippable/codecoverage script: true - -notifications: - email: - - exampleone@org.com From 04a179bb83dd1bae699d65cfcd9fd8f31d421edd Mon Sep 17 00:00:00 2001 From: harsh157 Date: Wed, 14 Oct 2015 15:36:13 +0530 Subject: [PATCH 08/17] Update shippable.yml --- shippable.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index a64f0a7a..f15d6d43 100755 --- a/shippable.yml +++ b/shippable.yml @@ -4,8 +4,6 @@ python: - 2.7 - pypy -install: - - pip install -r requirements.txt # Make folders for the reports From f260d5ece1ba8cbc5fae0d424681efd24f0104c4 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Wed, 14 Oct 2015 15:51:56 +0530 Subject: [PATCH 09/17] Update shippable.yml --- shippable.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index f15d6d43..bf7c715d 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,10 +1,8 @@ language: python -build_image: shippableimages/ubuntu1204_python python: - 2.7 - pypy # Make folders for the reports - script: true From af141009e2b6a292809bb9d76e341f58f04524f9 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Wed, 14 Oct 2015 16:16:51 +0530 Subject: [PATCH 10/17] Update shippable.yml --- shippable.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index bf7c715d..64c88347 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,8 +1,26 @@ language: python +build_image: shippableimages/ubuntu1204_python python: + - 2.6 - 2.7 + - 3.2 + - 3.3 + - 3.4 - pypy +install: + - pip install -r requirements.txt # Make folders for the reports -script: true +before_script: + - mkdir -p shippable/testresults + - mkdir -p shippable/codecoverage + +script: + - 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: + - exampleone@org.com From 2b1e95bfb324a7c36c6a4d7672f45f865ccc9b5c Mon Sep 17 00:00:00 2001 From: harsh157 Date: Mon, 26 Oct 2015 15:17:11 +0530 Subject: [PATCH 11/17] Update shippable.yml --- shippable.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index 64c88347..d737a71a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,12 +1,7 @@ language: python build_image: shippableimages/ubuntu1204_python python: - - 2.6 - 2.7 - - 3.2 - - 3.3 - - 3.4 - - pypy install: - pip install -r requirements.txt From 83ef4f691fdeb20a49e968f26d8b0ebe17322446 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Tue, 3 Nov 2015 10:58:35 +0530 Subject: [PATCH 12/17] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index d737a71a..9a8c16b1 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,5 @@ language: python -build_image: shippableimages/ubuntu1204_python + python: - 2.7 From 99e00dfa23de21f0b31ba6f4b57304e9a545a864 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Tue, 3 Nov 2015 12:41:14 +0530 Subject: [PATCH 13/17] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 9a8c16b1..24d7e2f4 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,7 @@ language: python +build_image: shippableimages/ubuntu1204_python + python: - 2.7 From 2379f7b18f35b1535fc78dd306256a289a3bd70d Mon Sep 17 00:00:00 2001 From: harsh157 Date: Wed, 18 Nov 2015 17:03:34 +0530 Subject: [PATCH 14/17] Update shippable.yml --- shippable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shippable.yml b/shippable.yml index 24d7e2f4..d8a2aa53 100755 --- a/shippable.yml +++ b/shippable.yml @@ -4,6 +4,9 @@ build_image: shippableimages/ubuntu1204_python python: - 2.7 + - 3.2 + - 3.3 + - 3.4 install: - pip install -r requirements.txt From e35459ef88b7948e9c358edff168b0e8027bddfb Mon Sep 17 00:00:00 2001 From: harsh157 Date: Tue, 1 Dec 2015 16:42:59 +0530 Subject: [PATCH 15/17] Update shippable.yml --- shippable.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index d8a2aa53..22a7e932 100755 --- a/shippable.yml +++ b/shippable.yml @@ -5,8 +5,8 @@ build_image: shippableimages/ubuntu1204_python python: - 2.7 - 3.2 - - 3.3 - - 3.4 + #- 3.3 + #- 3.4 install: - pip install -r requirements.txt @@ -22,5 +22,12 @@ script: - coverage xml -o shippable/codecoverage/coverage.xml notifications: - email: - - exampleone@org.com + email: + recipients: + - "harsh@shippable.com" + on_success: always + on_failure: always + irc: + pull_requests: true + channels: + - "chat.freenode.net#newTestShip" From 99a117fd35097974307d2333ad375b1806960d68 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Mon, 25 Jan 2016 15:48:47 +0530 Subject: [PATCH 16/17] Update shippable.yml --- shippable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 22a7e932..869e3c1a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -28,6 +28,5 @@ notifications: on_success: always on_failure: always irc: - pull_requests: true channels: - - "chat.freenode.net#newTestShip" + - "chat.freenode.net#shipTest" From ce63ed6a1783ae5737baf03989bc39e098f01ab6 Mon Sep 17 00:00:00 2001 From: harsh157 Date: Thu, 28 Jan 2016 15:27:00 +0530 Subject: [PATCH 17/17] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 869e3c1a..3e398ffc 100755 --- a/shippable.yml +++ b/shippable.yml @@ -29,4 +29,4 @@ notifications: on_failure: always irc: channels: - - "chat.freenode.net#shipTest" + - "irc.freenode.org#shipTest"