From 7b80a3fdd263a2279857444c5e151c050e7b9ddd Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 18:48:55 -0500 Subject: [PATCH 01/12] Update hw1.py First Submission --- homework1/hw1.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/homework1/hw1.py b/homework1/hw1.py index e642eac..013a6a2 100644 --- a/homework1/hw1.py +++ b/homework1/hw1.py @@ -4,35 +4,35 @@ def return_number_3(): """ This function should return an integer with the value of 3""" - return_value = None - return return_value + return_number_3 == 3 + return return_number_3 def return_string_vcu(): """ This function should return a string with the lowercase value of vcu""" - return_value = None - return return_value + return_string_vcu == "vcu" + return return_string_vcu def return_lowercased_string(input_string): """You have a variable called input_string that is of type string. Return it but the lowercase version of it.""" - return_value = input_string - return return_value + return_lowercased_string("HI THERE") == "hi there" + return return_lowercased_string def return_without_starting_ending_whitespace(input_string): """You have a variable called input_string that is of type string. Return it but with the surrounding (left and right) whitespace stripped.""" - return_value = input_string - return return_value + return_without_starting_ending_whitespace(" asdfghhjkl ") == "asdfghhjkl" + return return_without_starting_ending_whitespace def return_addition(first_number, second_number): """ Return the two numbers added together. """ - return_value = None - return return_value + return_addition(9,1) == 10 + return return_addition From d2393595b22554c84d26105a3ef4e185fd4924cd Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 19:01:34 -0500 Subject: [PATCH 02/12] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7b198eb..dda35ef 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Homework 1 - Week 3 -![Python package](https://github.com/vcu-chfauerbach/root_homework1/workflows/Python%20package/badge.svg) +![Python package](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Python%20package/badge.svg) -![Pylint](https://github.com/vcu-chfauerbach/root_homework1/workflows/Pylint/badge.svg) +![Pylint](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Pylint/badge.svg) -![Super-Linter](https://github.com/vcu-chfauerbach/root_homework1/workflows/Super-Linter/badge.svg) +![Super-Linter](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Super-Linter/badge.svg) For your homework, fork this repository to your account. From 91b0c24ed35add2b41742ed3a9885f803e517065 Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 19:09:03 -0500 Subject: [PATCH 03/12] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dda35ef..1bdb433 100644 --- a/README.md +++ b/README.md @@ -10,18 +10,16 @@ For your homework, fork this repository to your account. Updated the 'README.md' file to change the URLs for the github actions: -https://github.com/vcu-chfauerbach/root_homework1/workflows/Pylint/badge.svg + should become -https://github.com/YOUR_GITHUB_ACCOUNT/root_homework1/workflows/Pylint/badge.svg Edit the file ./homework1/hw1.py to make the three github actions pass. When they pass, and you see the updated badges in your repository, send me a link to the repository, like: -https://github.com/vcu-chfauerbach/root_homework1 + but -https://github.com/YOUR_GITHUB_ACCOUNT/root_homework1 From 9a551970f3cd58a6be5df123dac72a4a6eac682e Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 19:23:02 -0500 Subject: [PATCH 04/12] Update README.md --- README.md | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/README.md b/README.md index 1bdb433..03d87c3 100644 --- a/README.md +++ b/README.md @@ -4,22 +4,5 @@ ![Pylint](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Pylint/badge.svg) -![Super-Linter](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Super-Linter/badge.svg) - -For your homework, fork this repository to your account. - -Updated the 'README.md' file to change the URLs for the github actions: - - - -should become - - -Edit the file ./homework1/hw1.py to make the three github actions pass. - -When they pass, and you see the updated badges in your repository, send me a link to the repository, like: - - - -but +![Super-Linter](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Super-Linter/badge.svg) From 78eab70726de02fd808109d753546fa211989e71 Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 20:35:56 -0500 Subject: [PATCH 05/12] First submission after enabling workflows --- .vscode/settings.json | 8 ++++++++ homework1/hw1.py | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..df27cec --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "python.testing.pytestArgs": [ + "homework1" + ], + "python.testing.unittestEnabled": false, + "python.testing.nosetestsEnabled": false, + "python.testing.pytestEnabled": true +} \ No newline at end of file diff --git a/homework1/hw1.py b/homework1/hw1.py index 013a6a2..1a576d7 100644 --- a/homework1/hw1.py +++ b/homework1/hw1.py @@ -5,7 +5,7 @@ def return_number_3(): """ This function should return an integer with the value of 3""" return_number_3 == 3 - return return_number_3 + def return_string_vcu(): @@ -20,7 +20,7 @@ def return_lowercased_string(input_string): Return it but the lowercase version of it.""" return_lowercased_string("HI THERE") == "hi there" - return return_lowercased_string + def return_without_starting_ending_whitespace(input_string): @@ -36,3 +36,4 @@ def return_addition(first_number, second_number): return_addition(9,1) == 10 return return_addition + From fab8ccc9f0fd692e09fe6a060d6abdf97a8293bb Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:09:30 -0500 Subject: [PATCH 06/12] second submission --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 03d87c3..b451f46 100644 --- a/README.md +++ b/README.md @@ -4,5 +4,4 @@ ![Pylint](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Pylint/badge.svg) -![Super-Linter](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Super-Linter/badge.svg) - +![Super-Linter](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Super-Linter/badge.svg) \ No newline at end of file From cb0146a2911e10b1b29b500e556073afebaf23e7 Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:16:18 -0500 Subject: [PATCH 07/12] third submission --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b451f46..490f8ea 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ ![Pylint](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Pylint/badge.svg) -![Super-Linter](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Super-Linter/badge.svg) \ No newline at end of file +![Super-Linter](https://github.com/vcu-DBaptisteMitchell/root_homework1/workflows/Super-Linter/badge.svg) From 0e282814d025ca331b7a393b285f484b02e57994 Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:27:51 -0500 Subject: [PATCH 08/12] fourth submission --- .github/workflows/superlinter.yml | 1 + homework1/hw1.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/superlinter.yml b/.github/workflows/superlinter.yml index 96ce0cd..16c4a19 100644 --- a/.github/workflows/superlinter.yml +++ b/.github/workflows/superlinter.yml @@ -23,3 +23,4 @@ jobs: env: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + \ No newline at end of file diff --git a/homework1/hw1.py b/homework1/hw1.py index 1a576d7..00c2496 100644 --- a/homework1/hw1.py +++ b/homework1/hw1.py @@ -4,36 +4,36 @@ def return_number_3(): """ This function should return an integer with the value of 3""" - return_number_3 == 3 + return_value = 3 + return return_value def return_string_vcu(): """ This function should return a string with the lowercase value of vcu""" - return_string_vcu == "vcu" - return return_string_vcu + return_value = "vcu" + return return_value def return_lowercased_string(input_string): """You have a variable called input_string that is of type string. Return it but the lowercase version of it.""" - return_lowercased_string("HI THERE") == "hi there" - + return_value = input_string.lower() + return return_value def return_without_starting_ending_whitespace(input_string): """You have a variable called input_string that is of type string. Return it but with the surrounding (left and right) whitespace stripped.""" - return_without_starting_ending_whitespace(" asdfghhjkl ") == "asdfghhjkl" - return return_without_starting_ending_whitespace - + return_value =input_string.strip + return return_value def return_addition(first_number, second_number): """ Return the two numbers added together. """ - return_addition(9,1) == 10 - return return_addition + return_value = first_number + second_number + return return_value From 5bf13fac591a46b82aea35f8dfdde91a4a71ffb2 Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:54:11 -0500 Subject: [PATCH 09/12] submission 5 --- homework1/hw1.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/homework1/hw1.py b/homework1/hw1.py index 00c2496..ccf20f8 100644 --- a/homework1/hw1.py +++ b/homework1/hw1.py @@ -28,12 +28,11 @@ def return_without_starting_ending_whitespace(input_string): """You have a variable called input_string that is of type string. Return it but with the surrounding (left and right) whitespace stripped.""" - return_value =input_string.strip - return return_value + return_value = input_string.strip() + return return_value def return_addition(first_number, second_number): """ Return the two numbers added together. """ return_value = first_number + second_number return return_value - From fa250e6a1a7b60b63bd350b0628d0688bfadb66e Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 22:45:25 -0500 Subject: [PATCH 10/12] Update hw1.py --- homework1/hw1.py | 1 - 1 file changed, 1 deletion(-) diff --git a/homework1/hw1.py b/homework1/hw1.py index ccf20f8..c666e9b 100644 --- a/homework1/hw1.py +++ b/homework1/hw1.py @@ -8,7 +8,6 @@ def return_number_3(): return return_value - def return_string_vcu(): """ This function should return a string with the lowercase value of vcu""" From bd86d96278b99096110aa926b3225cc19cc0a1f1 Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 23:07:08 -0500 Subject: [PATCH 11/12] Update hw1.py --- homework1/hw1.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homework1/hw1.py b/homework1/hw1.py index c666e9b..82bc23b 100644 --- a/homework1/hw1.py +++ b/homework1/hw1.py @@ -6,7 +6,7 @@ def return_number_3(): return_value = 3 return return_value - + def return_string_vcu(): """ This function should return a string with the lowercase value of vcu""" @@ -30,6 +30,7 @@ def return_without_starting_ending_whitespace(input_string): return_value = input_string.strip() return return_value + def return_addition(first_number, second_number): """ Return the two numbers added together. """ From 1f5a32a146ea590af338b7c5f3c3459ad3479c99 Mon Sep 17 00:00:00 2001 From: vcu-DBaptisteMitchell <78172355+vcu-DBaptisteMitchell@users.noreply.github.com> Date: Mon, 15 Feb 2021 23:16:28 -0500 Subject: [PATCH 12/12] Update hw1.py --- homework1/hw1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homework1/hw1.py b/homework1/hw1.py index 82bc23b..4a2cad3 100644 --- a/homework1/hw1.py +++ b/homework1/hw1.py @@ -20,7 +20,7 @@ def return_lowercased_string(input_string): Return it but the lowercase version of it.""" return_value = input_string.lower() - return return_value + return return_value def return_without_starting_ending_whitespace(input_string): @@ -28,7 +28,7 @@ def return_without_starting_ending_whitespace(input_string): Return it but with the surrounding (left and right) whitespace stripped.""" return_value = input_string.strip() - return return_value + return return_value def return_addition(first_number, second_number):