From 60fa080e39091ab84087ed089a4a53d878d457c9 Mon Sep 17 00:00:00 2001 From: Kirill Garbar Date: Thu, 11 Oct 2018 14:38:04 +0300 Subject: [PATCH 1/6] Add PR template --- .github/PULL_REQUEST_TEMPLATE.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..f41a4fd --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,18 @@ +# Выполнено ДЗ № + + - [ ] Основное ДЗ + - [ ] Задание со * + +## В процессе сделано: + - Пункт 1 + - Пункт 2 + +## Как запустить проект: + - Например, запустить команду X в директории Y + +## Как проверить работоспособность: + - Например, перейти по ссылке http://localhost:8080 + +## PR checklist + - [ ] Выставил label с номером домашнего задания + - [ ] Выставил label с темой домашнего задания \ No newline at end of file From 36c50869befe441e338b73ed87dcfa4604309ed9 Mon Sep 17 00:00:00 2001 From: Kirill Garbar Date: Fri, 12 Oct 2018 02:02:17 +0300 Subject: [PATCH 2/6] Added .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2d1389a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +dist: trusty +sudo: required +language: bash +before_install: + - curl https://raw.githubusercontent.com/express42/otus-homeworks/2018-09/run.sh | bash From fcdcdc03ecbe80ec6ca1c29205be6c05f5b8dfe1 Mon Sep 17 00:00:00 2001 From: webprogrammer Date: Thu, 11 Oct 2018 23:18:55 +0000 Subject: [PATCH 3/6] Added secure secret --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d1389a..983efb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,9 @@ dist: trusty sudo: required language: bash before_install: - - curl https://raw.githubusercontent.com/express42/otus-homeworks/2018-09/run.sh | bash +- curl https://raw.githubusercontent.com/express42/otus-homeworks/2018-09/run.sh | + bash +notifications: + slack: + rooms: + secure: EhTC9IJTQ8T7wpX+rnOcidNbr/VhbenTUNnL0Trmxz0IEu5HVJVcwHs83dKdMMtwxMzQBqZByf6fobkSucSu71hJlL3tawIcGuyCOrsCDjsNSoMZTUf3gHQaM0ClU5M7jzttJEHITKUaDu2FsGkscfQeHjH+rLOObx/pf9qAch/IDBRMQ8ywcvCq03VAQGKW74Iw16qCax4c/YzCDFfJG6+HlaWkT3UifHSdXKs3+nI1bMd7WEY26lx/1dXWJf1CV/WDwI2vWPGns2jmaHxLuQLDR6wLNeMGvnyiJ4YtbB1U9TaWj5eauOG2n32ZXhl8oteNN/S8JRJB86SQLSTKbX+6ishXw3CTAPtEJqj8XcbxaA6pfG6uxxt1wBk9jn+jwB6hFfRFHU7JxgfO7lKdtE4e2fJsg++CJ1YG6QbJ8BFfBw2UAhbe+omjOaqnmcWcVwAnAt7Oq06wp7Ir3knLhyu8GOrNI9hhp3fHgda4RnH1So7ZsTiigQa7EtDOdH9rz+mS9+87uCBQjBEOqtEkWFF38f+N7W/4BGdX4jygbgDEMP4RJQkhu7P7e22mgzlnc78Cerj1N/zeHNTMndBuxdSSzdSKS4qmgjzcShqUeDHT1UHJKFB4U5cqR3NzDjjch7YQKlsaZIHDlQw0h6vMLMrDG0xwDTPC34o96OmAXMk= From 2d54506ace895ff2c986045f27794925c0340431 Mon Sep 17 00:00:00 2001 From: webprogrammer Date: Thu, 11 Oct 2018 23:18:55 +0000 Subject: [PATCH 4/6] Added secure secret --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d1389a..983efb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,9 @@ dist: trusty sudo: required language: bash before_install: - - curl https://raw.githubusercontent.com/express42/otus-homeworks/2018-09/run.sh | bash +- curl https://raw.githubusercontent.com/express42/otus-homeworks/2018-09/run.sh | + bash +notifications: + slack: + rooms: + secure: EhTC9IJTQ8T7wpX+rnOcidNbr/VhbenTUNnL0Trmxz0IEu5HVJVcwHs83dKdMMtwxMzQBqZByf6fobkSucSu71hJlL3tawIcGuyCOrsCDjsNSoMZTUf3gHQaM0ClU5M7jzttJEHITKUaDu2FsGkscfQeHjH+rLOObx/pf9qAch/IDBRMQ8ywcvCq03VAQGKW74Iw16qCax4c/YzCDFfJG6+HlaWkT3UifHSdXKs3+nI1bMd7WEY26lx/1dXWJf1CV/WDwI2vWPGns2jmaHxLuQLDR6wLNeMGvnyiJ4YtbB1U9TaWj5eauOG2n32ZXhl8oteNN/S8JRJB86SQLSTKbX+6ishXw3CTAPtEJqj8XcbxaA6pfG6uxxt1wBk9jn+jwB6hFfRFHU7JxgfO7lKdtE4e2fJsg++CJ1YG6QbJ8BFfBw2UAhbe+omjOaqnmcWcVwAnAt7Oq06wp7Ir3knLhyu8GOrNI9hhp3fHgda4RnH1So7ZsTiigQa7EtDOdH9rz+mS9+87uCBQjBEOqtEkWFF38f+N7W/4BGdX4jygbgDEMP4RJQkhu7P7e22mgzlnc78Cerj1N/zeHNTMndBuxdSSzdSKS4qmgjzcShqUeDHT1UHJKFB4U5cqR3NzDjjch7YQKlsaZIHDlQw0h6vMLMrDG0xwDTPC34o96OmAXMk= From fdd62a24baff435e43bedb2cc6a8db7b8a6954da Mon Sep 17 00:00:00 2001 From: webprogrammer Date: Thu, 11 Oct 2018 23:40:11 +0000 Subject: [PATCH 5/6] Added test.py --- play-travis/test.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 play-travis/test.py diff --git a/play-travis/test.py b/play-travis/test.py new file mode 100644 index 0000000..8fff0ff --- /dev/null +++ b/play-travis/test.py @@ -0,0 +1,9 @@ +import unittest + +class NumbersTest(unittest.TestCase): + + def test_equal(self): + self.assertEqual(1 + 1, 1) + +if __name__ == '__main__': + unittest.main() \ No newline at end of file From 8f8704775f83a63be1965559e3093dbb208e1208 Mon Sep 17 00:00:00 2001 From: Kirill Garbar Date: Thu, 11 Oct 2018 23:57:38 +0000 Subject: [PATCH 6/6] fixed test.py --- play-travis/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/play-travis/test.py b/play-travis/test.py index 8fff0ff..41e7655 100644 --- a/play-travis/test.py +++ b/play-travis/test.py @@ -3,7 +3,7 @@ class NumbersTest(unittest.TestCase): def test_equal(self): - self.assertEqual(1 + 1, 1) + self.assertEqual(1, 1) if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main()