From 9217291314d0aab8c740bd6f35d0bc2b639fe93a Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 16:49:47 +0300 Subject: [PATCH 01/11] added file1 --- file1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 file1.txt diff --git a/file1.txt b/file1.txt new file mode 100644 index 0000000..e69de29 From 2579c0bd26896bbbe410921170109beb8d2ec9ae Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 17:00:47 +0300 Subject: [PATCH 02/11] added file4.txt --- file4.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file4.txt diff --git a/file4.txt b/file4.txt new file mode 100644 index 0000000..ace13d3 --- /dev/null +++ b/file4.txt @@ -0,0 +1 @@ +new code \ No newline at end of file From 9d4a994a5af8699d703b7097a61506e6b522abd2 Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 17:03:49 +0300 Subject: [PATCH 03/11] deleted file1,file4 --- file1.txt | 0 file4.txt | 1 - 2 files changed, 1 deletion(-) delete mode 100644 file1.txt delete mode 100644 file4.txt diff --git a/file1.txt b/file1.txt deleted file mode 100644 index e69de29..0000000 diff --git a/file4.txt b/file4.txt deleted file mode 100644 index ace13d3..0000000 --- a/file4.txt +++ /dev/null @@ -1 +0,0 @@ -new code \ No newline at end of file From c9c0f789c92e086a31021aaab9f9b75e166f56f8 Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 17:11:23 +0300 Subject: [PATCH 04/11] added new file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1.txt diff --git a/file1.txt b/file1.txt new file mode 100644 index 0000000..297a34b --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +new code From 3a84c571d026e56342559d20aa62d6a5e40d1f3d Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 17:13:36 +0300 Subject: [PATCH 05/11] deleted file1.txt --- file1.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 file1.txt diff --git a/file1.txt b/file1.txt deleted file mode 100644 index 297a34b..0000000 --- a/file1.txt +++ /dev/null @@ -1 +0,0 @@ -new code From 050604af1e1ea3c0562f3a6c1aead744911519d1 Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 17:16:30 +0300 Subject: [PATCH 06/11] added test.txt --- test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..e69de29 From 83717234251eded64015245a7c093579d89cdd03 Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 17:18:42 +0300 Subject: [PATCH 07/11] added file5.txt --- file5.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 file5.txt diff --git a/file5.txt b/file5.txt new file mode 100644 index 0000000..e69de29 From 4fff6c9bb6d05b0607adde12e32d53d0bed761f4 Mon Sep 17 00:00:00 2001 From: sagidevops <101520951+sagidevops@users.noreply.github.com> Date: Sat, 9 Apr 2022 17:21:00 +0300 Subject: [PATCH 08/11] Create file10 --- file10 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file10 diff --git a/file10 b/file10 new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/file10 @@ -0,0 +1 @@ + From dcf46e5e9db8b8e768671983d2f1241d28a15c4c Mon Sep 17 00:00:00 2001 From: Sagi Elhayani Date: Sat, 9 Apr 2022 17:25:17 +0300 Subject: [PATCH 09/11] deleted files --- file10 | 1 - file5.txt | 0 test.txt | 0 3 files changed, 1 deletion(-) delete mode 100644 file10 delete mode 100644 file5.txt delete mode 100644 test.txt diff --git a/file10 b/file10 deleted file mode 100644 index 8b13789..0000000 --- a/file10 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/file5.txt b/file5.txt deleted file mode 100644 index e69de29..0000000 diff --git a/test.txt b/test.txt deleted file mode 100644 index e69de29..0000000 From dfb598b99fa40595558884418f20acdd5db26c15 Mon Sep 17 00:00:00 2001 From: sagidevops <101520951+sagidevops@users.noreply.github.com> Date: Mon, 30 May 2022 21:13:35 +0300 Subject: [PATCH 10/11] Sagi Elhayani, Nir Ashkenazi(Final Project dev to sagi_nir_sol branch) (#3) --- StateCap.py | 183 +++++++++++++++++++++++++++------------------------- strings.py | 53 +++++++-------- 2 files changed, 120 insertions(+), 116 deletions(-) diff --git a/StateCap.py b/StateCap.py index 73fcf7f..ac51b1c 100644 --- a/StateCap.py +++ b/StateCap.py @@ -9,110 +9,117 @@ Implement the function def get_state(capital): below so it returns the state. GOTCHAS: What happens if two states have the same capital name, how do you handle that? - """ import sys -import pytest - STATES_CAPITALS = { - 'Alabama' : 'Montgomery', - 'Alaska' : 'Juneau', - 'Arizona' : 'Phoenix', + 'Alabama': 'Montgomery', + 'Alaska': 'Juneau', + 'Arizona': 'Phoenix', 'Arkansas': 'Little Rock', - 'California' : 'Sacramento', - 'Colorado' : 'Denver', - 'Connecticut' : 'Hartford', - 'Delaware' : 'Dover', - 'Florida' : 'Tallahassee', - 'Georgia' : 'Atlanta', - 'Hawaii' : 'Honolulu', - 'Idaho' : 'Boise', - 'Illinois' : 'Springfield', - 'Indiana' : 'Indianapolis', - 'Iowa' : 'Des Moines', - 'Kansas' : 'Topeka', - 'Kentucky' : 'Frankfort', - 'Louisiana' : 'Baton Rouge', - 'Maine' : 'Augusta', - 'Maryland' : 'Annapolis', - 'Massachusetts' : 'Boston', - 'Michigan' : 'Lansing', - 'Minnesota' : 'Saint Paul', - 'Mississippi' : 'Jackson', - 'Missouri' : 'Jefferson City', - 'Montana' : 'Helena', - 'Nebraska' : 'Lincoln', - 'Nevada' : 'Carson City', - 'New Hampshire' : 'Concord', - 'New Jersey' : 'Trenton', - 'New Mexico' : 'Santa Fe', - 'New York' : 'Albany', - 'North Carolina' : 'Raleigh', - 'North Dakota' : 'Bismarck', - 'Ohio' : 'Columbus', - 'Oklahoma' : 'Oklahoma City', - 'Oregon' : 'Salem', - 'Pennsylvania' : 'Harrisburg', - 'Rhode Island' : 'Providence', - 'South Carolina' : 'Columbia', - 'South Dakota' : 'Pierre', - 'Tennessee' : 'Nashville', - 'Texas' : 'Austin', - 'Utah' : 'Salt Lake City', - 'Vermont' : 'Montpelier', - 'Virginia' : 'Richmond', - 'Washington' : 'Olympia', - 'West Virginia' : 'Charleston', - 'Wisconsin' : 'Madison', - 'Wyoming' : 'Cheyenne', + 'California': 'Sacramento', + 'Colorado': 'Denver', + 'Connecticut': 'Hartford', + 'Delaware': 'Dover', + 'Florida': 'Tallahassee', + 'Georgia': 'Atlanta', + 'Hawaii': 'Honolulu', + 'Idaho': 'Boise', + 'Illinois': 'Springfield', + 'Indiana': 'Indianapolis', + 'Iowa': 'Des Moines', + 'Kansas': 'Topeka', + 'Kentucky': 'Frankfort', + 'Louisiana': 'Baton Rouge', + 'Maine': 'Augusta', + 'Maryland': 'Annapolis', + 'Massachusetts': 'Boston', + 'Michigan': 'Lansing', + 'Minnesota': 'Saint Paul', + 'Mississippi': 'Jackson', + 'Missouri': 'Jefferson City', + 'Montana': 'Helena', + 'Nebraska': 'Lincoln', + 'Nevada': 'Carson City', + 'New Hampshire': 'Concord', + 'New Jersey': 'Trenton', + 'New Mexico': 'Santa Fe', + 'New York': 'Albany', + 'North Carolina': 'Raleigh', + 'North Dakota': 'Bismarck', + 'Ohio': 'Columbus', + 'Oklahoma': 'Oklahoma City', + 'Oregon': 'Salem', + 'Pennsylvania': 'Harrisburg', + 'Rhode Island': 'Providence', + 'South Carolina': 'Columbia', + 'South Dakota': 'Pierre', + 'Tennessee': 'Nashville', + 'Texas': 'Austin', + 'Utah': 'Salt Lake City', + 'Vermont': 'Montpelier', + 'Virginia': 'Richmond', + 'Washington': 'Olympia', + 'West Virginia': 'Charleston', + 'Wisconsin': 'Madison', + 'Wyoming': 'Cheyenne', } def capital_of_Idaho(): - # Your code here - pass - -def all_states(): - # Your code here - pass - -def all_capitals(): - # Your code here - pass - -def states_capitals_string(): - # Your code here - pass + global STATES_CAPITALS + print(STATES_CAPITALS['Idaho']) - -def get_state(capital): - pass - - - -def test_state_to_capital(): - assert 'Cheyenne' == STATES_CAPITALS['Wyoming'] - - -def test_state_to_capital_unknown(): - with pytest.raises(KeyError): - STATES_CAPITALS[''] +def all_states(): + global STATES_CAPITALS + for state in list(STATES_CAPITALS.keys()): + print(state) -def test_capital_to_state(): - assert 'Wyoming' == get_state('Cheyenne') +def all_capitals(): + global STATES_CAPITALS + for capital in list(STATES_CAPITALS.keys()): + print(STATES_CAPITALS[capital]) -def test_capital_to_state_unknown(): - with pytest.raises(KeyError): - get_state('') +def states_capitals_string(): + global STATES_CAPITALS + string = "" + for temp in list(STATES_CAPITALS.keys()): + string += temp + " -> " + STATES_CAPITALS[temp] + "," + string = string[:-1] + print(string) + return string -def main(): - return pytest.main(__file__) +def alphabetically_sorted(string): + sorted = string.split(",") + sorted.sort() + string_new = "" + for x in sorted: + string_new += x + "," + string_new = string_new[:-1] + print(string_new) -if __name__ == '__main__': - sys.exit(main()) +def get_state(capital): + global STATES_CAPITALS + index = list(STATES_CAPITALS.values()).index(capital) + key = list(STATES_CAPITALS.keys())[index] + print(key) + + +if __name__ == "__main__": + print("1. - ", end="") + capital_of_Idaho() + print("2. - ", end="") + all_states() + print("3. - ", end="") + all_capitals() + print("4. - ", end="") + string1 = states_capitals_string() + print("5. - ", end="") + alphabetically_sorted(string1) + print(f"7. - ", end="") + get_state("Des Moines") diff --git a/strings.py b/strings.py index 7915338..8ebe177 100644 --- a/strings.py +++ b/strings.py @@ -9,39 +9,36 @@ Example: ['mont', 'y py', 'thon', 's fl', 'ying', ' cir', 'cus'] ### git comment """ -import pytest +a_string = 'monty pythons flying circus' + def no_duplicates(a_string): - pass + string = "" + lst = sorted(set(a_string)) + for i in lst: + string += i + print(string) def reversed_words(a_string): - pass + lst = a_string.split(" ") + lst.reverse() + print(lst) def four_char_strings(a_string): - pass - - -def test_no_duplicates(): - s = 'monty pythons flying circus' - assert no_duplicates(s) == ' cfghilmnoprstuy' - - -def test_reversed_words(): - s = 'monty pythons flying circus' - assert reversed_words(s) == ['circus', 'flying', 'pythons', 'monty'] - - -def test_four_char_strings(): - s = 'monty pythons flying circus' - assert four_char_strings(s) == ['mont', 'y py', 'thon', 's fl', 'ying', ' cir', 'cus'] - - -def main(): - return pytest.main(__file__) - - -if __name__ == '__main__': - main() - + lst = [] + while a_string: + chars = a_string[:4:] + lst.append(chars) + a_string = a_string.replace(chars, "") + print(lst) + + +if __name__ == "__main__": + print("1. - ", end="") + no_duplicates(a_string) + print("2. - ", end="") + reversed_words(a_string) + print("3. - ", end="") + four_char_strings(a_string) \ No newline at end of file From a1c73ad4d6111a2d44a96117e2c1d3289e3eac8c Mon Sep 17 00:00:00 2001 From: sagidevops <101520951+sagidevops@users.noreply.github.com> Date: Tue, 12 Jul 2022 22:13:23 +0300 Subject: [PATCH 11/11] test - Added a file (#4) * Fixed the Codes * fixed Codes * Fixed Codes * added file --- asdasd.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 asdasd.txt diff --git a/asdasd.txt b/asdasd.txt new file mode 100644 index 0000000..e69de29