From 6b98e3ae4ab328634cca770d841b39fac68f8f4b Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:13:14 +0200 Subject: [PATCH 01/11] Update hello.py --- hello.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hello.py b/hello.py index d4fb0b0..9ade904 100644 --- a/hello.py +++ b/hello.py @@ -12,6 +12,8 @@ def say_what(): def main(): hello(say_what()) + print('lol') + print('xd') return 0 From 6021f2f4f142291d6d9ea403dd1ecb87a34799be Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:16:51 +0200 Subject: [PATCH 02/11] Update hello.py --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 9ade904..31bc3d3 100644 --- a/hello.py +++ b/hello.py @@ -12,7 +12,7 @@ def say_what(): def main(): hello(say_what()) - print('lol') + print('lol1') print('xd') return 0 From bcfe4fe2b3423661e4e8a222616ffc3d84a39654 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:33:37 +0200 Subject: [PATCH 03/11] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dce752e..0f56297 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# python-example \ No newline at end of file +[![Build Status](https://travis-ci.org/redxm-x/python-example.svg?branch=master)](https://travis-ci.org/redxm-x/python-example) +# python-example From da7125fee6916045781878fb265a828735fe0d5b Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:34:06 +0200 Subject: [PATCH 04/11] Update hello.py --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 31bc3d3..dbdb400 100644 --- a/hello.py +++ b/hello.py @@ -7,7 +7,7 @@ def hello(what): def say_what(): - return 'world' + return 'wor' def main(): From a1e3b74e71dedcdac6873b5f73b88b99c8fc3908 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:46:05 +0200 Subject: [PATCH 05/11] Update hello.py --- hello.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hello.py b/hello.py index dbdb400..317b40f 100644 --- a/hello.py +++ b/hello.py @@ -7,11 +7,17 @@ def hello(what): def say_what(): - return 'wor' + return 'world' +def add_numbers(a, b): + return a+b def main(): hello(say_what()) + add_numbers(2, 2) + add_numbers(3, 3) + add_numbers(4, 4) + add_numbers(5, 5) print('lol1') print('xd') return 0 From ca477bb76c72cdfb170906dd73d2672ea3450128 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:53:34 +0200 Subject: [PATCH 06/11] Update hello.py --- hello.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 317b40f..935b861 100644 --- a/hello.py +++ b/hello.py @@ -10,7 +10,8 @@ def say_what(): return 'world' def add_numbers(a, b): - return a+b + result = a+b + return result def main(): hello(say_what()) From 1fbd44fe64910e3d220725441908166ce4f0e7d4 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:56:25 +0200 Subject: [PATCH 07/11] Update test_hello.py --- tests/test_hello.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test_hello.py b/tests/test_hello.py index a9ecb71..4250687 100644 --- a/tests/test_hello.py +++ b/tests/test_hello.py @@ -3,3 +3,12 @@ def test_says_world(): assert hello.say_what() == 'world' + +def test_1(): + assert add_numbers(2, 2) == 4 +def test_2(): + assert add_numbers(3, 3) == 6 +def test_3(): + assert add_numbers(4, 4) == 8 +def test_4(): + assert add_numbers(5, 5) == 10 From 12e1d860d69848516581dc396593f8ee611fadd2 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 17:03:08 +0200 Subject: [PATCH 08/11] Update test_hello.py --- tests/test_hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_hello.py b/tests/test_hello.py index 4250687..874de18 100644 --- a/tests/test_hello.py +++ b/tests/test_hello.py @@ -1,4 +1,4 @@ -import hello +from hello import * def test_says_world(): From bbfef0d5817257476b9389a75b394332d4ffe4cd Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 17:07:44 +0200 Subject: [PATCH 09/11] Update test_hello.py --- tests/test_hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_hello.py b/tests/test_hello.py index 874de18..da0dee3 100644 --- a/tests/test_hello.py +++ b/tests/test_hello.py @@ -2,7 +2,7 @@ def test_says_world(): - assert hello.say_what() == 'world' + assert hello(say_what()) == 'world' def test_1(): assert add_numbers(2, 2) == 4 From ace495c2077a7be240c2b79f0bc5e3e73c02fae8 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 17:10:52 +0200 Subject: [PATCH 10/11] Update test_hello.py --- tests/test_hello.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/test_hello.py b/tests/test_hello.py index da0dee3..eaf4a2b 100644 --- a/tests/test_hello.py +++ b/tests/test_hello.py @@ -1,9 +1,6 @@ from hello import * -def test_says_world(): - assert hello(say_what()) == 'world' - def test_1(): assert add_numbers(2, 2) == 4 def test_2(): From 3eeacf8b9ecf0640d902f26a45b99c61a35c5a81 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia <45079734+redxm-x@users.noreply.github.com> Date: Sun, 11 Oct 2020 17:19:37 +0200 Subject: [PATCH 11/11] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b666f03..da74d92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: python +CI: true sudo: false python: - 2.7 - 3.4 +- 3.7 +before_script: echo "Printing before script" script: py.test -v