From 24772126b50821b4e97dad2a1b2ec339ad41e045 Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 00:50:41 +0530 Subject: [PATCH 01/12] travis versions --- .travis.yml | 16 ++++++++++++++++ .travis0.yml | 16 ++++++++++++++++ .travis1.yml | 16 ++++++++++++++++ .travis2.yml | 17 +++++++++++++++++ .travis3.yml | 28 ++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+) create mode 100644 .travis.yml create mode 100644 .travis0.yml create mode 100644 .travis1.yml create mode 100644 .travis2.yml create mode 100644 .travis3.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..dbb7919 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: python +python: + - "3.6" +notifications: + email: + recepients: + - tidhamecha@in.ibm.com + on_success: always + on_failure: always + +before_install: + - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc + +script: + - echo "skipping tests" +# - py.test -s # or py.test for Python versions 3.5 and belo \ No newline at end of file diff --git a/.travis0.yml b/.travis0.yml new file mode 100644 index 0000000..dbb7919 --- /dev/null +++ b/.travis0.yml @@ -0,0 +1,16 @@ +language: python +python: + - "3.6" +notifications: + email: + recepients: + - tidhamecha@in.ibm.com + on_success: always + on_failure: always + +before_install: + - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc + +script: + - echo "skipping tests" +# - py.test -s # or py.test for Python versions 3.5 and belo \ No newline at end of file diff --git a/.travis1.yml b/.travis1.yml new file mode 100644 index 0000000..dbb7919 --- /dev/null +++ b/.travis1.yml @@ -0,0 +1,16 @@ +language: python +python: + - "3.6" +notifications: + email: + recepients: + - tidhamecha@in.ibm.com + on_success: always + on_failure: always + +before_install: + - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc + +script: + - echo "skipping tests" +# - py.test -s # or py.test for Python versions 3.5 and belo \ No newline at end of file diff --git a/.travis2.yml b/.travis2.yml new file mode 100644 index 0000000..587473e --- /dev/null +++ b/.travis2.yml @@ -0,0 +1,17 @@ +language: python +python: + - "3.6" +notifications: + slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p + email: + recepients: + - tidhamecha@in.ibm.com + on_success: never + on_failure: always + +before_install: + - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc + +script: + - echo "skipping tests" +# - py.test -s # or py.test for Python versions 3.5 and below \ No newline at end of file diff --git a/.travis3.yml b/.travis3.yml new file mode 100644 index 0000000..fc850c3 --- /dev/null +++ b/.travis3.yml @@ -0,0 +1,28 @@ +language: python +python: + - "3.6" +notifications: + slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p + email: + recepients: + - tidhamecha@in.ibm.com + on_success: never + on_failure: always + +before_install: + - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc + +script: + - echo "skipping tests" +# - py.test -s # or py.test for Python versions 3.5 and below + +deploy: +- provider: cloudfoundry + username: apikey + password: $apikey + api: https://api.eu-gb.bluemix.net + organization: tidhamecha + space: dev + manifest: manifest.yml + on: + branch: develop \ No newline at end of file From 88a2fe3495c38d56e06033b028cf8b070ec7d26e Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 00:55:27 +0530 Subject: [PATCH 02/12] made it minimal --- .travis0.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis0.yml b/.travis0.yml index dbb7919..64ebfe1 100644 --- a/.travis0.yml +++ b/.travis0.yml @@ -1,13 +1,7 @@ language: python python: - "3.6" -notifications: - email: - recepients: - - tidhamecha@in.ibm.com - on_success: always - on_failure: always - + before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc From 5dbdd0bb11b59066357b5e4cb32018eb91e1047c Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 01:00:47 +0530 Subject: [PATCH 03/12] recipient spelling --- .travis.yml | 2 +- .travis1.yml | 2 +- .travis2.yml | 2 +- .travis3.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbb7919..0833937 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "3.6" notifications: email: - recepients: + recipients: - tidhamecha@in.ibm.com on_success: always on_failure: always diff --git a/.travis1.yml b/.travis1.yml index dbb7919..0833937 100644 --- a/.travis1.yml +++ b/.travis1.yml @@ -3,7 +3,7 @@ python: - "3.6" notifications: email: - recepients: + recipients: - tidhamecha@in.ibm.com on_success: always on_failure: always diff --git a/.travis2.yml b/.travis2.yml index 587473e..470ab5a 100644 --- a/.travis2.yml +++ b/.travis2.yml @@ -4,7 +4,7 @@ python: notifications: slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p email: - recepients: + recipients: - tidhamecha@in.ibm.com on_success: never on_failure: always diff --git a/.travis3.yml b/.travis3.yml index fc850c3..bbf3a12 100644 --- a/.travis3.yml +++ b/.travis3.yml @@ -4,7 +4,7 @@ python: notifications: slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p email: - recepients: + recipients: - tidhamecha@in.ibm.com on_success: never on_failure: always From 6918dd477bd3d513dca1d181201b46211c0c8c75 Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 01:06:39 +0530 Subject: [PATCH 04/12] travis lint done --- .travis.yml | 6 +++--- .travis1.yml | 6 +++--- .travis2.yml | 6 +++--- .travis3.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0833937..75d0961 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ python: notifications: email: recipients: - - tidhamecha@in.ibm.com - on_success: always - on_failure: always + - tidhamecha@in.ibm.com + on_success: always + on_failure: always before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc diff --git a/.travis1.yml b/.travis1.yml index 0833937..75d0961 100644 --- a/.travis1.yml +++ b/.travis1.yml @@ -4,9 +4,9 @@ python: notifications: email: recipients: - - tidhamecha@in.ibm.com - on_success: always - on_failure: always + - tidhamecha@in.ibm.com + on_success: always + on_failure: always before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc diff --git a/.travis2.yml b/.travis2.yml index 470ab5a..a265546 100644 --- a/.travis2.yml +++ b/.travis2.yml @@ -5,9 +5,9 @@ notifications: slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p email: recipients: - - tidhamecha@in.ibm.com - on_success: never - on_failure: always + - tidhamecha@in.ibm.com + on_success: always + on_failure: always before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc diff --git a/.travis3.yml b/.travis3.yml index bbf3a12..65d2b94 100644 --- a/.travis3.yml +++ b/.travis3.yml @@ -5,9 +5,9 @@ notifications: slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p email: recipients: - - tidhamecha@in.ibm.com - on_success: never - on_failure: always + - tidhamecha@in.ibm.com + on_success: always + on_failure: always before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc From 5b1406171d64334530ddb8cb2da4bc62780178eb Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 01:10:36 +0530 Subject: [PATCH 05/12] checking for travis0 --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75d0961..64ebfe1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,7 @@ language: python python: - "3.6" -notifications: - email: - recipients: - - tidhamecha@in.ibm.com - on_success: always - on_failure: always - + before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc From 8a84fb2bf842bb0f94fd6b1858381e6563a8da4a Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 01:12:10 +0530 Subject: [PATCH 06/12] checking for travis1 --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 64ebfe1..75d0961 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,13 @@ language: python python: - "3.6" - +notifications: + email: + recipients: + - tidhamecha@in.ibm.com + on_success: always + on_failure: always + before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc From de76d5f9b50dd001f9702f84e611953d8d7a526d Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 01:14:13 +0530 Subject: [PATCH 07/12] checking for travis2 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 75d0961..a265546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: python python: - "3.6" notifications: + slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p email: recipients: - tidhamecha@in.ibm.com @@ -13,4 +14,4 @@ before_install: script: - echo "skipping tests" -# - py.test -s # or py.test for Python versions 3.5 and belo \ No newline at end of file +# - py.test -s # or py.test for Python versions 3.5 and below \ No newline at end of file From f1a9a9559d8c5f81882b66a00482a3ab058d7b63 Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 01:15:40 +0530 Subject: [PATCH 08/12] checking for travis3 --- .travis.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a265546..65d2b94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,15 @@ before_install: script: - echo "skipping tests" -# - py.test -s # or py.test for Python versions 3.5 and below \ No newline at end of file +# - py.test -s # or py.test for Python versions 3.5 and below + +deploy: +- provider: cloudfoundry + username: apikey + password: $apikey + api: https://api.eu-gb.bluemix.net + organization: tidhamecha + space: dev + manifest: manifest.yml + on: + branch: develop \ No newline at end of file From 1bc3635d2ee06a7941036b4a30a3b7346be675ae Mon Sep 17 00:00:00 2001 From: "Tejas I. Dhamecha" Date: Mon, 13 Jan 2020 01:23:24 +0530 Subject: [PATCH 09/12] changed org --- .travis.yml | 4 ++-- .travis3.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65d2b94..af8d64c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ deploy: - provider: cloudfoundry username: apikey password: $apikey - api: https://api.eu-gb.bluemix.net + api: https://api.ng.bluemix.net organization: tidhamecha - space: dev + space: here manifest: manifest.yml on: branch: develop \ No newline at end of file diff --git a/.travis3.yml b/.travis3.yml index 65d2b94..af8d64c 100644 --- a/.travis3.yml +++ b/.travis3.yml @@ -20,9 +20,9 @@ deploy: - provider: cloudfoundry username: apikey password: $apikey - api: https://api.eu-gb.bluemix.net + api: https://api.ng.bluemix.net organization: tidhamecha - space: dev + space: here manifest: manifest.yml on: branch: develop \ No newline at end of file From 9433e6152209a85aa3cea1c9ee82efb8c25e7dfe Mon Sep 17 00:00:00 2001 From: ManojAthreya Date: Mon, 13 Jan 2020 13:47:29 +0530 Subject: [PATCH 10/12] Hello to Namaste --- static/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/index.html b/static/index.html index 347e9cc..29f37d8 100644 --- a/static/index.html +++ b/static/index.html @@ -27,11 +27,11 @@ $( document ).ready(function() { $.i18n().load( { en: { - "welcome": "Welcome.", + "namaste": "Namaste", "name": "name", "what_is_your_name": "What is your name?", "hello": "Hello $1", - "added_to_database": "Hello $1, I've added you to the database!", + "added_to_database": "Namaste $1, I've added you to the database!", "database_contents": "Database contents: " }, ja: { @@ -52,7 +52,7 @@
-

+

From 5d3639c313d9a204e0ffc067b8e6a101500dd1aa Mon Sep 17 00:00:00 2001 From: ManojAthreya Date: Mon, 13 Jan 2020 14:27:40 +0530 Subject: [PATCH 11/12] travis file --- .travis.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index af8d64c..64ebfe1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,10 @@ language: python python: - "3.6" -notifications: - slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p - email: - recipients: - - tidhamecha@in.ibm.com - on_success: always - on_failure: always - + before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc script: - echo "skipping tests" -# - py.test -s # or py.test for Python versions 3.5 and below - -deploy: -- provider: cloudfoundry - username: apikey - password: $apikey - api: https://api.ng.bluemix.net - organization: tidhamecha - space: here - manifest: manifest.yml - on: - branch: develop \ No newline at end of file +# - py.test -s # or py.test for Python versions 3.5 and belo \ No newline at end of file From fe206cca73c227b250d7f99f1f3d5d85f5246a15 Mon Sep 17 00:00:00 2001 From: ManojAthreya Date: Mon, 13 Jan 2020 17:10:38 +0530 Subject: [PATCH 12/12] changes --- .travis.yml | 22 ++++++++++++++++++++-- .travis3.yml | 8 ++++---- manifest.yml | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64ebfe1..134405d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,28 @@ language: python python: - "3.6" - +notifications: + slack: ibm-research:bLcRT4dofYlBUocjPBvlxO9p + email: + recipients: + - tidhamecha@in.ibm.com + on_success: always + on_failure: always + before_install: - echo -e "machine github.com\n login $GITHUB_TOKEN" >> ~/.netrc script: - echo "skipping tests" -# - py.test -s # or py.test for Python versions 3.5 and belo \ No newline at end of file +# - py.test -s # or py.test for Python versions 3.5 and below + +deploy: +- provider: cloudfoundry + username: apikey + password: $apikey + api: https://api.eu-gb.bluemix.net + organization: manojathreya13@gmail.com + space: dev + manifest: manifest.yml + on: + branch: develop diff --git a/.travis3.yml b/.travis3.yml index af8d64c..134405d 100644 --- a/.travis3.yml +++ b/.travis3.yml @@ -20,9 +20,9 @@ deploy: - provider: cloudfoundry username: apikey password: $apikey - api: https://api.ng.bluemix.net - organization: tidhamecha - space: here + api: https://api.eu-gb.bluemix.net + organization: manojathreya13@gmail.com + space: dev manifest: manifest.yml on: - branch: develop \ No newline at end of file + branch: develop diff --git a/manifest.yml b/manifest.yml index 5f4c568..a6480e7 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,5 +1,5 @@ --- applications: - - name: GetStartedPython + - name: test hosting random-route: true memory: 128M