')
- assert "A nice header line" in file_contents
- assert ' align="center"' in file_contents
-
-
-def test_html_doctype():
- html = Html()
- file_contents = render_result(html)
- print(file_contents)
-
- assert file_contents.startswith("\n")
-
-
-def test_meta():
- """
- test the meta tag
- """
- m = Meta(charset="UTF-8")
- file_contents = render_result(m)
- print(file_contents)
-
- assert file_contents == ''
-
-
-def test_whole_thing():
- """
- Render a complete page
-
- This is not really a unit test, and does not test that the results
- are correct, but does ensure that it all runs, and provides output
- to look at
- """
- page = Html()
-
- head = Head()
- head.append(Meta(charset="UTF-8"))
- head.append(Title("Python Class Sample page"))
- page.append(head)
-
- body = Body()
-
- body.append(H(2, "Python Class - Html rendering example"))
-
- body.append(P("Here is a paragraph of text -- there could be more of them, "
- "but this is enough to show that we can do some text",
- style="text-align: center; font-style: oblique;"))
-
- body.append(Hr())
-
- list = Ul(id="TheList", style="line-height:200%")
-
- list.append(Li("The first item in a list"))
- list.append(Li("This is the second item", style="color: red"))
-
- item = Li()
- item.append("And this is a ")
- item.append(A("http://google.com/", "link"))
- item.append("to google")
-
- list.append(item)
-
- body.append(list)
-
- page.append(body)
-
- # Element.indent = " "
- # now render it:
- with open("sample_output.html", 'w') as f:
- page.render(f)
-
- # assert False
diff --git a/source/solutions/html_render/step_8/test_html_render2.py b/source/solutions/html_render/step_8/test_html_render2.py
deleted file mode 100644
index cdf8c48d..00000000
--- a/source/solutions/html_render/step_8/test_html_render2.py
+++ /dev/null
@@ -1,425 +0,0 @@
-#!/usr/bin/env python
-
-
-import os
-from io import StringIO
-
-from html_render import Element, Body, P, Html, Head, Title
-
-
-# test utilities
-
-def render_element_file(element, filename='temp_render_file.html', remove=False):
- """
- renders an element, and returns what got rendered
-
- This version uses an actual file on disk -- yu may want to use it so you
- can see the file afterward.
-
- :param element: the element to be rendered (its render() method will be called)
-
- :param filename='temp_render_file.html': the name of the temporary file to be used.
-
- :param remove=True: Whether to remove the file after using it to render.
- Set this to True if you want to be able to look at after
- the tests run.
-
- NOTE: - this could be refactored, and still used everywhere.
- """
- with open(filename, 'w') as out_file:
- element.render(out_file)
- with open(filename, 'r') as in_file:
- contents = in_file.read()
- if remove:
- os.remove(filename)
- return contents
-
-
-def render_element(element, cur_ind=""):
- # this version uses a StringIO object, to keep it all in memory
- """
- renders an element, and returns what got rendered
-
- This can be used by multiple tests.
-
- :param element: the element to be rendered (its render() method will be called)
-
- :param filename='temp_render_file.html': the name of the temporary file to be used.
-
- :param remove=True: Whether to remove the file after using it to render.
- Set this to True if you want to be able to look at after
- the tests run.
-
- NOTE: - this could be refactored, and still used everywhere.
- """
- sio = StringIO()
- element.render(sio, cur_ind=cur_ind)
- # if remove:
- # os.remove(filename)
- return sio.getvalue()
-
-
-def test_new_element():
- """
- not much here, but it shows Elements can be initialized
- """
- el_object = Element()
- el_object2 = Element('content')
-
-
-# careful here -- this is testing internal implimentations
-# sometimes helpful as you are developing, but you may want to remove
-# these tests once you have more working.
-def test_add_content():
- el_object = Element('content')
- assert el_object.content == ['content']
-
- el_object = Element()
- assert el_object.content == []
-
-
-def test_adding_empty_string():
- el_object = Element('')
- assert el_object.content == ['']
-
-
-def test_append_string():
- el_object = Element('spam, spam, spam')
- el_object.append(', wonderful spam')
- assert el_object.content == ['spam, spam, spam', ', wonderful spam']
-
-
-def test_tag_exists():
- assert Element.tag == 'html'
- el_object = Element('spam, spam, spam')
- assert el_object.tag == 'html'
-
-
-def test_indent_exists():
- assert Element.indent == ' '
-
-
-# Now we get tot he real "meat" of the tests --does the code do what
-# it is supposed to do?
-def test_render():
- my_stuff = 'spam, spam, spam'
- el_object = Element(my_stuff)
- more_stuff = 'eggs, eggs, eggs'
- el_object.append(more_stuff)
- contents = render_element(el_object).strip()
- assert contents.startswith('')
- assert contents.endswith('')
- assert my_stuff in contents
- assert more_stuff in contents
-
-
-
-# you want to be careful with these:
-# It is testing an implementation detail, which is less than ideal.
-# sometimes in TDD, it's helpful to have quickies tests of
-# implementation details so you can see that partially written code
-# is working -- but if/when you can test actual functionality, that's
-# better. In this case, once we have a render() method, we can test
-# that the tag gets rendered properly, so don't need to test if the
-# tag attribute is correct.
-
-# def test_body_tag():
-# assert Body.tag == 'body'
-
-# def test_p_tag():
-# assert P.tag == 'p'
-
-
-# def test_html_tag():
-# assert HTML.tag == 'html'
-
-# finally! a really good test.
-# This is an actual element that we want to render
-# so whatever the implimentation deatails, it's working.
-def test_render_body():
- my_stuff = 'spam, spam, spam'
- el_object = Body(my_stuff)
- more_stuff = 'eggs, eggs, eggs'
- el_object.append(more_stuff)
- contents = render_element(el_object).strip()
- assert contents.startswith('')
- assert contents.endswith('')
- assert my_stuff in contents
- assert more_stuff in contents
-
-
-def test_render_P():
- my_stuff = 'spam, spam, spam'
- p = P(my_stuff)
- more_stuff = 'eggs, eggs, eggs'
- p.append(more_stuff)
- contents = render_element(p).strip()
- assert contents.startswith('')
- assert contents.endswith('
')
- assert my_stuff in contents
- assert more_stuff in contents
-
-
-def test_render_html():
- my_stuff = 'spam, spam, spam'
- el_object = Html(my_stuff)
- more_stuff = 'eggs, eggs, eggs'
- el_object.append(more_stuff)
- contents = render_element(el_object)
- assert contents.startswith('')
- assert contents.endswith('')
- assert my_stuff in contents
- assert more_stuff in contents
-
-
-def test_render_non_strings():
- # this is creating a html page with a single body() element in it
- # and a string inside that.
- el_object = Html(Body('any string I like'))
-
- contents = render_element(el_object)
- # make sure extra whitespace at beginning or end doesn't mess things up.
- contents = contents.strip()
-
- print(contents) # so we can see what's going on if a test fails
-
- # so what should the results be?
- # the html tag is the outer tag, so the contents should start and end with that.
- assert contents.startswith('')
- assert contents.endswith('')
-
- # the body tags had better be there too
- assert '' in contents
- assert '') < contents.index('')
- # the opening tag should come before the content
- assert contents.index('') < contents.index('any string')
-
-
-def test_render_non_strings2():
- """
- Testing nested elements and text, in a more complex way
- """
- html = Html()
- body = Body()
- html.append(body)
- p = P('any string I like')
- p.append('even more random text')
- body.append(p)
- body.append(P('and this is a different string'))
- contents = render_element(html).strip()
-
- print(contents) # so we can see what's going on if a test fails
-
- # so what should the results be?
- # the html tag is the outer tag, so the contents should start and end with that.
- assert contents.startswith('')
- assert contents.endswith('')
-
- # the body tags had better be there too
- assert '' in contents
- assert ' tags
- assert contents.count('')
-
- # we want the text, too:
- assert 'any string I like' in contents
- assert 'even more random text' in contents
- assert 'and this is a different string' in contents
-
- # you could, of course, test much more..but hopefully other things are tested, too.
-
-
-def test_indent():
- """
- Tests that the indentation gets passed through to the renderer
- """
- html = Html("some content")
- cur_ind = 6 * " "
- file_contents = render_element(html, cur_ind=cur_ind)
-
- print(file_contents)
- lines = file_contents.split("\n")
-
- assert lines[0].startswith(cur_ind + "<")
- assert lines[1].startswith(cur_ind + Element.indent + "som")
- assert lines[-1].startswith(cur_ind + "<")
-
-
-def test_indent_contents():
- """
- The contents in a element should be indented more than the tag
- by the amount in the indent class attribute
- """
- html = Html("some content")
- file_contents = render_element(html, cur_ind="")
-
- print(file_contents)
- lines = file_contents.split("\n")
- assert lines[1].startswith(Element.indent)
-
-
-def test_multiple_indent():
- """
- make sure multiple levels get indented properly
- """
- body = Body()
- body.append(P("some text"))
- body.append(P("even more text"))
- html = Html(body)
-
- file_contents = render_element(html)
-
- print(file_contents)
- lines = file_contents.split("\n")
- for i in range(3):
- assert lines[i].startswith(i * Element.indent + "<")
- assert lines[3].startswith(3 * Element.indent + "some")
- assert lines[4].startswith(2 * Element.indent + "
")
- assert lines[5].startswith(2 * Element.indent + "")
- assert lines[6].startswith(3 * Element.indent + "even ")
- for i in range(3):
- assert lines[-(i + 1)].startswith(i * Element.indent + "<")
-
-
-def test_title():
- """
- This will implicitly test the OneLineTag element
- """
- t = Title("Isn't this a nice title?")
-
- # making sure indentation still works
- file_contents = render_element(t, cur_ind=" ")
-
- print(file_contents)
- # no "strip()" -- making sure there are no extra newlines
- assert file_contents.startswith("
I")
- assert file_contents.endswith("? ")
- # the only newline should be at the end
-
-
-def test_head():
- """
- testing Head with a title in it -- it should never be blank
- """
- h = Head()
- h.append(Title("A nifty title for the page"))
- file_contents = render_element(h, cur_ind=' ')
-
- print(file_contents)
- assert file_contents.startswith(" ")
- assert file_contents.endswith(" ")
-
- assert "" in file_contents
- assert "" in file_contents
- assert "A nifty title for the page" in file_contents
-
-
-def test_full_page_with_title():
- """
- not much to actually test here, but good to see it put together.
-
- everything should have already been tested.
- """
- page = Html()
-
- head = Head()
- head.append(Title("PythonClass Example"))
-
- page.append(head)
-
- body = Body()
-
- body.append(P("Here is a Pgraph of text -- there could be more of them, "
- "but this is enough to show that we can do some text"))
- body.append(P("And here is another piece of text -- you should be able to add any number"))
-
- page.append(body)
-
- file_contents = render_element(page)
-
- print(file_contents)
-
- # uncomment this to see results
- # assert False
-
-
-def test_single_attribute():
- #
- # Here is a Pgraph of text -- there could be more of them, but this is enough to show that we can do some text
- #
- p = P("Here is a paragraph of text", style="text-align: center; font-style: oblique;")
-
- results = render_element(p)
-
- assert results.startswith('')
-
- print(results)
-
-def test_multiple_attributes():
- #
- # Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
- #
- p = P("Here is a paragraph of text",
- id="fred",
- color="red",
- size="12px",
- )
-
- results = render_element(p)
- print(results)
-
- lines = results.split('\n')
- assert lines[0].startswith(' ')
- assert 'id="fred"' in lines[0]
- assert 'color="red"' in lines[0]
- assert 'size="12px"' in lines[0]
-
-def test_multiple_attributes_title():
- t = Title("Here is a paragraph of text",
- id="fred",
- color="red",
- size="12px",
- )
-
- results = render_element(t)
- print(results)
-
- lines = results.split('\n')
- assert lines[0].startswith('
')
- assert 'id="fred"' in lines[0]
- assert 'color="red"' in lines[0]
- assert 'size="12px"' in lines[0]
-
-
-# test class attribute
-def test_class_attribute():
- atts = {"id": "fred",
- "class": "special",
- "size": "12px",
- }
- p = P("Here is a paragraph of text",
- **atts)
-
- results = render_element(p)
- print(results)
-
- lines = results.split('\n')
- assert lines[0].startswith('<p ')
- assert lines[0].strip().endswith('">')
- assert 'id="fred"' in lines[0]
- assert 'class="special"' in lines[0]
- assert 'size="12px"' in lines[0]
-
-
-
-
diff --git a/source/solutions/mailroom/mailroom_basic/mailroom.py b/source/solutions/mailroom/mailroom_basic/mailroom.py
deleted file mode 100755
index 9fd134a0..00000000
--- a/source/solutions/mailroom/mailroom_basic/mailroom.py
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Mailroom Exercise -- as of Session 3 -- no dictionaries or Exceptions
-"""
-
-from textwrap import dedent # nifty utility!
-import math
-
-# In memory representation of the donor database
-# using a tuple for each donor
-# -- kind of like a record in a database table
-# the donations are in a list -- so you can add to them
-# Note the mutable inside an immutable
-
-donor_db = [("William Gates, III", [653772.32, 12.17]),
- ("Jeff Bezos", [877.33]),
- ("Paul Allen", [663.23, 43.87, 1.32]),
- ("Mark Zuckerberg", [1663.23, 4300.87, 10432.0]),
- ]
-
-#loop through the donor list and print the 0th element of the list
-def print_donors():
- print("Donor list:\n")
- for donor in donor_db:
- print(donor[0])
-
-
-def find_donor(name):
- """
- find a donor in the donor db
-
- :param: the name of the donor
-
- :returns: The donor data structure -- None if not in the donor_db
- """
- for donor in donor_db:
- # do a case-insenstive compare
- if name.strip().lower() == donor[0].lower():
- return donor
- return None
-
-
-def main_menu_selection():
- """
- Print out the main application menu and then read the user input.
- """
- action = input(dedent('''
- Choose an action:
-
- 't' - Send a Thank You
- 'r' - Create a Report
- 'q' - Quit
-
- > '''))
- return action.strip()
-
-
-def gen_letter(donor):
- """
- Generate a thank you letter for the donor
-
- :param: donor tuple
-
- :returns: string with letter
- """
- return dedent('''
- Dear {}
-
- Thank you for your very kind donation of ${:.2f}.
- It will be put to very good use.
-
- Sincerely,
- -The Team
- '''.format(donor[0], donor[1][-1]))
-
-
-def send_thank_you():
- """
- Execute the logic to record a donation and generate a thank you message.
- """
- # Read a valid donor to send a thank you from, handling special commands to
- # let the user navigate as defined.
- while True:
- name = input("Enter a donor's name "
- "(or 'list' to see all donors or 'menu' to exit)> ").strip()
- if name == "list":
- print_donors()
- elif name == "menu":
- return
- else:
- break
-
- # Now prompt the user for a donation amount to apply. Since this is
- # also an exit point to the main menu, we want to make sure this is
- # done before mutating the donors list object.
- while True:
- amount_str = input("Enter a donation amount (or 'menu' to exit) > ").strip()
- if amount_str == "menu":
- return
- # Make sure amount is a valid amount before leaving the input loop
- amount = float(amount_str)
- # NOTE: this is getting a bit carried away...
- if math.isnan(amount) or math.isinf(amount) or round(amount, 2) == 0.00:
- print("error: donation amount is invalid\n")
- continue # not really needed, but makes it more clear
- else:
- break
-
- # If this is a new user, ensure that the database has the necessary data structure.
- donor = find_donor(name)
- if donor is None:
- donor = (name, [])
- donor_db.append(donor)
-
- # Record the donation
- # Note how the donor object can be manipulated while it is in the donors list.
- donor[1].append(amount)
-
- print(gen_letter(donor))
-
-
-def sort_key(item):
- return item[1]
-
-
-def print_donor_report():
- """
- Generate the report of the donors and amounts donated.
- """
- # First, reduce the raw data into a summary list view
- report_rows = []
- for (name, gifts) in donor_db:
- total_gifts = sum(gifts)
- num_gifts = len(gifts)
- avg_gift = total_gifts / num_gifts
- report_rows.append((name, total_gifts, num_gifts, avg_gift))
-
- # sort the report data
- report_rows.sort(key=sort_key)
- # print it out in with a nice format.
- print("{:25s} | {:11s} | {:9s} | {:12s}".format(
- "Donor Name", "Total Given", "Num Gifts", "Average Gift"))
- print("-" * 66)
- for row in report_rows:
- print("{:25s} {:11.2f} {:9d} {:12.2f}".format(*row))
-
-if __name__ == "__main__":
- running = True
- while running:
- selection = main_menu_selection()
- if selection == "t":
- send_thank_you()
- elif selection == "r":
- print_donor_report()
- elif selection == "q":
- running = False
- else:
- print("error: menu selection is invalid!")
diff --git a/source/solutions/mailroom/mailroom_test/mailroom2.py b/source/solutions/mailroom/mailroom_test/mailroom2.py
deleted file mode 100755
index 49dfd81d..00000000
--- a/source/solutions/mailroom/mailroom_test/mailroom2.py
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/usr/bin/env python
-"""
-mailroom assignment
-
-This version uses a dict for the main db, and exception handling to
-check input, and has been factored to be amenable to testing.
-"""
-
-import sys
-import math
-
-# handy utility to make pretty printing easier
-from textwrap import dedent
-
-
-# In memory representation of the donor database
-# using a tuple for each donor
-# -- kind of like a record in a database table
-# using a dict with a lower case version of the donor's name as the key
-# This makes it easier to have a 'normalized' key.
-# you could get a bit fancier by having each "record" be a dict, with
-# "name" and "donations" as keys.
-def get_donor_db():
- return {'william gates iii': ("William Gates III", [653772.32, 12.17]),
- 'jeff bezos': ("Jeff Bezos", [877.33]),
- 'paul allen': ("Paul Allen", [663.23, 43.87, 1.32]),
- 'mark zuckerberg': ("Mark Zuckerberg", [1663.23, 4300.87, 10432.0]),
- }
-
-
-def list_donors():
- """
- creates a list of the donors as a string, so they can be printed
-
- Not calling print from here makes it more flexible and easier to
- test
- """
- listing = ["Donor list:"]
- for donor in donor_db.values():
- listing.append(donor[0])
- return "\n".join(listing)
-
-
-def find_donor(name):
- """
- find a donor in the donor db
-
- :param: the name of the donor
-
- :returns: The donor data structure -- None if not in the donor_db
- """
- key = name.strip().lower()
- return donor_db.get(key)
-
-
-def add_donor(name):
- """
- Add a new donor to the donor db
-
- :param: the name of the donor
-
- :returns: the new Donor data structure
- """
- name = name.strip()
- donor = (name, [])
- donor_db[name.lower()] = donor
- return donor
-
-
-def main_menu_selection():
- """
- Print out the main application menu and then read the user input.
- """
- action = input(dedent('''
- Choose an action:
-
- 1 - Send a Thank You
- 2 - Create a Report
- 3 - Send letters to everyone
- 4 - Quit
-
- > '''))
- return action.strip()
-
-
-def gen_letter(donor):
- """
- Generate a thank you letter for the donor
-
- :param: donor tuple
-
- :returns: string with letter
-
- note: This doesn't actually write to a file -- that's a separate
- function. This makes it more flexible and easier to test.
- """
- return dedent('''Dear {0:s},
-
- Thank you for your very kind donation of ${1:.2f}.
- It will be put to very good use.
-
- Sincerely,
- -The Team
- '''.format(donor[0], donor[1][-1]))
-
-
-def send_thank_you():
- """
- Execute the logic to record a donation and generate a thank you message.
- """
- # Read a valid donor to send a thank you from, handling special commands to
- # let the user navigate as defined.
- while True:
- name = input("Enter a donor's name (or list to see all donors or 'menu' to exit)> ").strip()
- if name == "list":
- print(list_donors())
- elif name == "menu":
- return
- else:
- break
-
- # Now prompt the user for a donation amount to apply. Since this is
- # also an exit point to the main menu, we want to make sure this is
- # done before mutating the db.
- while True:
- amount_str = input("Enter a donation amount (or 'menu' to exit)> ").strip()
- if amount_str == "menu":
- return
- # Make sure amount is a valid amount before leaving the input loop
- try:
- amount = float(amount_str)
- # extra check here -- unlikely that someone will type "NaN", but
- # it IS possible, and it is a valid floating point number:
- # http://en.wikipedia.org/wiki/NaN
- if math.isnan(amount) or math.isinf(amount) or round(amount, 2) == 0.00:
- raise ValueError
- # in this case, the ValueError could be raised by the float() call, or by the NaN-check
- except ValueError:
- print("error: donation amount is invalid\n")
- else:
- break
-
- # If this is a new user, ensure that the database has the necessary
- # data structure.
- donor = find_donor(name)
- if donor is None:
- donor = add_donor(name)
-
- # Record the donation
- donor[1].append(amount)
- print(gen_letter(donor))
-
-
-def sort_key(item):
- # used to sort on name in donor_db
- return item[1]
-
-
-def generate_donor_report():
- """
- Generate the report of the donors and amounts donated.
-
- :returns: the donor report as a string.
- """
- # First, reduce the raw data into a summary list view
- report_rows = []
- for (name, gifts) in donor_db.values():
- total_gifts = sum(gifts)
- num_gifts = len(gifts)
- avg_gift = total_gifts / num_gifts
- report_rows.append((name, total_gifts, num_gifts, avg_gift))
-
- # sort the report data
- report_rows.sort(key=sort_key)
- report = []
- report.append("{:25s} | {:11s} | {:9s} | {:12s}".format("Donor Name",
- "Total Given",
- "Num Gifts",
- "Average Gift"))
- report.append("-" * 66)
- for row in report_rows:
- report.append("{:25s} ${:10.2f} {:9d} ${:11.2f}".format(*row))
- return "\n".join(report)
-
-
-def save_letters_to_disk():
- """
- make a letter for each donor, and save it to disk.
- """
- for donor in donor_db.values():
- letter = gen_letter(donor)
- # I don't like spaces in filenames...
- filename = donor[0].replace(" ", "_") + ".txt"
- open(filename, 'w').write(letter)
-
-
-def print_donor_report():
- print(generate_donor_report())
-
-
-def quit():
- sys.exit(0)
-
-if __name__ == "__main__":
-
- donor_db = get_donor_db()
-
- running = True
-
- selection_dict = {"1": send_thank_you,
- "2": print_donor_report,
- "3": save_letters_to_disk,
- "4": quit}
-
- while True:
- selection = main_menu_selection()
- try:
- selection_dict[selection]()
- except KeyError:
- print("error: menu selection is invalid!")
diff --git a/source/solutions/mailroom/mailroom_test/test_mailroom2.py b/source/solutions/mailroom/mailroom_test/test_mailroom2.py
deleted file mode 100644
index e633e575..00000000
--- a/source/solutions/mailroom/mailroom_test/test_mailroom2.py
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env python
-
-"""
-unit tests for the mailroom program
-"""
-import os
-
-import mailroom2 as mailroom
-
-# so that it's there for the tests
-mailroom.donor_db = mailroom.get_donor_db()
-
-
-def test_list_donors():
- listing = mailroom.list_donors()
-
- # hard to test this throughly -- better not to hard code the entire
- # thing. But check for a few aspects -- this will catch the likely
- # errors
- assert listing.startswith("Donor list:\n")
- assert "Jeff Bezos" in listing
- assert "William Gates III" in listing
- assert len(listing.split('\n')) == 5
-
-
-def test_find_donor():
- """ checks a donor that is there, but with odd case and spaces"""
- donor = mailroom.find_donor("jefF beZos ")
-
- assert donor[0] == "Jeff Bezos"
-
-
-def test_find_donor_not():
- "test one that's not there"
- donor = mailroom.find_donor("Jeff Bzos")
-
- assert donor is None
-
-
-def test_gen_letter():
- """ test the donor letter """
-
- # create a sample donor
- donor = ("Fred Flintstone", [432.45, 65.45, 230.0])
- letter = mailroom.gen_letter(donor)
- # what to test? tricky!
- assert letter.startswith("Dear Fred Flintstone")
- assert letter.endswith("-The Team\n")
- assert "donation of $230.00" in letter
-
-
-def test_add_donor():
- name = "Fred Flintstone "
-
- donor = mailroom.add_donor(name)
- donor[1].append(300)
- assert donor[0] == "Fred Flintstone"
- assert donor[1] == [300]
- assert mailroom.find_donor(name) == donor
-
-
-def test_generate_donor_report():
-
- report = mailroom.generate_donor_report()
-
- print(report) # printing so you can see it if it fails
- # this is pretty tough to test
- # these are not great, because they will fail if unimportant parts of the
- # report are changed.
- # but at least you know that codes working now.
- assert report.startswith("Donor Name | Total Given | Num Gifts | Average Gift")
-
- assert "Jeff Bezos $ 877.33 1 $ 877.33" in report
-
-
-def test_save_letters_to_disk():
- """
- This only tests that the files get created, but that's a start
-
- Note that the contents of the letter was already
- tested with test_gen_letter
- """
-
- mailroom.save_letters_to_disk()
-
- assert os.path.isfile('Jeff_Bezos.txt')
- assert os.path.isfile('William_Gates_III.txt')
- # check that it'snot empty:
- with open('William_Gates_III.txt') as f:
- size = len(f.read())
- assert size > 0
-
-
-if __name__ == "__main__":
- # this is best run with a test runner, like pytest
- # But if not, at least this will run them all.
- test_list_donors()
- test_find_donor()
- test_find_donor_not()
- test_gen_letter()
- test_add_donor()
- test_generate_donor_report()
- test_save_letters_to_disk()
- print("All tests Passed")
diff --git a/source/solutions/sparse_array/slice_sparse.py b/source/solutions/sparse_array/slice_sparse.py
deleted file mode 100644
index c40fb76a..00000000
--- a/source/solutions/sparse_array/slice_sparse.py
+++ /dev/null
@@ -1,139 +0,0 @@
-
-"""
-example of emulating a sequence using slices
-"""
-
-
-class SparseArray(object):
-
- def __init__(self, my_array=()):
- self.length = len(my_array)
- self.sparse_array = self._convert_to_sparse(my_array)
-
- def _convert_to_sparse(self, my_array):
- sparse_array = {}
- for index, number in enumerate(my_array):
- if number:
- sparse_array[index] = number
- return sparse_array
-
- def __len__(self):
- return self.length
-
- def __str__(self):
- msg = ['SparseArray: [']
- for i in range(self.length):
- msg.append("{} ".format(self[i]))
- msg.append(']')
- return "".join(msg)
-
- def __getitem__(self, index):
- # this version supports slicing -- far more complicated
- mini_array = []
- if isinstance(index, slice):
- start, stop, step = index.indices(len(self))
- if step is None:
- step = 1
- key = start
- mini_array = []
- while key < stop:
- mini_array.append(self[key])
- key += step
- return mini_array
- else:
- # makes it an int, even if it's some other
- # type that supports being used as an index
- index = index.__index__()
- return self._get_single_value(index)
-
- def _get_single_value(self, key):
- if key >= self.length:
- raise IndexError('array index out of range')
- else:
- return self.sparse_array.get(key, 0)
-
- def __setitem__(self, index, value):
- if isinstance(index, slice):
- start, stop, step = index.indices(len(self))
- if step is None:
- step = 1
- key = start
- new_values = []
- new_keys = []
- for each in value:
- if key < stop:
- self[key] = each
- else:
- # now instead of replacing values, we need to add (a) value(s) in the center,
- # and move stuff over, probably want to collect all of the changes,
- # and then make a new dictionary
- new_values.append(each)
- new_keys.append(key)
- key += step
- if new_keys:
- self._add_in_slice(new_keys, new_values)
- else:
- index = index.__index__()
- self._set_single_value(index, value)
-
- def _set_single_value(self, key, value):
- if key > self.length:
- raise IndexError('array assignment index out of range')
- if value != 0:
- self.sparse_array[key] = value
- else:
- # if the value is being set to zero, we probably need to
- # remove a key from our dictionary.
- self.sparse_array.pop(key, None)
-
- def _add_in_slice(self, new_keys, new_values):
- # sometimes we need to add in extra values
- # any existing values
- # greater than the last key of the new data
- # will be increased by how many
- new_dict = {}
- slice_length = len(new_keys)
- for k, v in self.sparse_array.items():
- if k >= new_keys[-1]:
- # print('change keys')
- # if greater than slice, change key
- new_dict[k + slice_length] = v
- elif k in new_keys:
- # if this is a key we are changing, change it,
- # unless we are changing to a zero...
- new_value = values[new_keys.index(k)]
- if new_value != 0:
- new_dict[k] = new_value
- else:
- new_dict[k] = v
- # what if our new key was not previously in the dictionary?
- # stick it in now
- for k in new_keys:
- if k not in new_dict.keys():
- new_dict[k] = new_values[new_keys.index(k)]
- # note we don't want to do update, since we need to make sure we are
- # getting rid of the old keys, when we moved the value to a new key
- self.sparse_array = new_dict
- # now we need to increase the length by the amount we increased our array by
- self.length += slice_length
-
- def __delitem__(self, key):
- # we probably need to move the keys if we are not deleting the last
- # number, use pop in case it was a zero
- if key == self.length - 1:
- self.sparse_array.pop(key, None)
- else:
- # since we need to adjust all of the keys after the one we are
- # deleting, probably most efficient to create a new dictionary
- new_dict = {}
- for k, v in self.sparse_array.items():
- if k >= key:
- new_dict[k - 1] = v
- else:
- new_dict[k] = v
- # note we don't want to do update, since we need to make sure we are
- # getting rid of the old keys, when we moved the value to a new key
- self.sparse_array = new_dict
- # length is now one shorter
- self.length -= 1
-
diff --git a/source/solutions/sparse_array/sparse_array.py b/source/solutions/sparse_array/sparse_array.py
deleted file mode 100644
index d9543cab..00000000
--- a/source/solutions/sparse_array/sparse_array.py
+++ /dev/null
@@ -1,75 +0,0 @@
-
-"""
-An example of emulating a sequence
-
-A SparseArray is like a list, but only stores the non-zero values
-
-It can be indexed, appended-to, and iterated through.
-
-This version does not support slicing.
-"""
-
-
-class SparseArray(object):
-
- def __init__(self, my_array=()):
- """
- initilize a sparse array
-
- :param my_array: an initial sequence to start with
- if there are zeros in it, they wil not be stored
- """
- self.length = len(my_array)
- # self.sparse_array is a dict that stores only the non-zero items
- self.sparse_array = self._convert_to_sparse(my_array)
-
- def _convert_to_sparse(self, my_array):
- sparse_array = {}
- for index, number in enumerate(my_array):
- if number: # remember that zeros are falsey.
- sparse_array[index] = number
- # or the dict comprehension method:
- # sparse_array = {index:number for index, number in enumerate(my_array) if number}
- return sparse_array
-
- def __len__(self):
- return self.length
-
- def __getitem__(self, key):
- # fixme: doesn't handle negative indexes properly
- try:
- return self.sparse_array[key]
- except KeyError:
- if key >= self.length:
- raise IndexError('array index out of range')
- return 0
-
- def __setitem__(self, key, value):
- if key > self.length:
- raise IndexError('array assignment index out of range')
- if value != 0:
- self.sparse_array[key] = value
- else:
- # if the value is being set to zero, we probably need to
- # remove a key from our dictionary.
- self.sparse_array.pop(key, None)
-
- def __delitem__(self, key):
- # we probably need to move the keys if we are not deleting the last
- # number, use pop in case it was a zero
- if key == self.length - 1: # it's the last item -- easy.
- self.sparse_array.pop(key, None)
- else:
- # since we need to adjust all of the keys after the one we are
- # deleting, probably most efficient to create a new dictionary
- new_dict = {}
- for k, v in self.sparse_array.items():
- if k >= key:
- new_dict[k - 1] = v
- else:
- new_dict[k] = v
- # note we don't want to do update, since we need to make sure we are
- # getting rid of the old keys, when we moved the value to a new key
- self.sparse_array = new_dict
- # length is now one shorter
- self.length -= 1
diff --git a/source/solutions/sparse_array/test_slice_sparse.py b/source/solutions/sparse_array/test_slice_sparse.py
deleted file mode 100644
index 4a7994c8..00000000
--- a/source/solutions/sparse_array/test_slice_sparse.py
+++ /dev/null
@@ -1,129 +0,0 @@
-"""
-this version tests the solution with slicing tests
-"""
-
-
-import pytest
-from slice_sparse import SparseArray
-
-
-def set_up():
- my_array = [2, 0, 0, 0, 3, 0, 0, 0, 4, 5, 6, 0, 2, 9]
- my_sparse = SparseArray(my_array)
- return (my_array, my_sparse)
-
-
-def test_object_exists():
- my_array, my_sparse = set_up()
- assert isinstance(my_sparse, SparseArray)
-
-
-def test_get_non_zero_number():
- my_array, my_sparse = set_up()
- assert my_sparse[4] == 3
-
-
-def test_get_zero():
- my_array, my_sparse = set_up()
- assert my_sparse[1] == 0
-
-
-def test_get_element_not_in_array():
- my_array, my_sparse = set_up()
- with pytest.raises(IndexError):
- my_sparse[14]
-
-
-def test_str():
- my_array, my_sparse = set_up()
-
-
-def test_get_slice():
- my_array, my_sparse = set_up()
- assert my_sparse[2:4] == [0, 0]
-
-
-def test_set_slice():
- my_array, my_sparse = set_up()
- my_sparse[2:4] = [2, 3, 4]
- assert my_sparse[:] == [2, 0, 2, 3, 4, 3, 0, 0, 0, 4, 5, 6, 0, 2, 9]
-
-
-def test_set_slice_over_end():
- # this slice goes over the end
- my_array, my_sparse = set_up()
- print(my_sparse)
- my_sparse[2:4] = [2, 3, 4]
- assert my_sparse[:] == [2, 0, 2, 3, 4, 3, 0, 0, 0, 4, 5, 6, 0, 2, 9]
-
-
-def test_get_length():
- my_array, my_sparse = set_up()
- assert len(my_sparse) == 14
-
-
-def test_change_number_in_array():
- my_array, my_sparse = set_up()
- my_sparse[0] = 3
- assert my_sparse[0] == 3
- # make sure others aren't changed
- assert my_sparse[1] == 0
- # make sure still same length
- assert len(my_sparse) == 14
-
-
-def test_change_number_in_array_to_zero():
- my_array, my_sparse = set_up()
- my_sparse[4] = 0
- assert my_sparse[4] == 0
- # make sure still same length
- assert len(my_sparse) == 14
-
-
-def test_change_number_in_array_from_zero():
- my_array, my_sparse = set_up()
- my_sparse[1] = 4
- assert my_sparse[1] == 4
- # make sure still same length
- assert len(my_sparse) == 14
-
-
-def test_change_slice():
- my_array, my_sparse = set_up()
- my_sparse[1:3] = [2, 3]
- assert my_sparse[1:3] == [2, 3]
-
-
-def test_delete_number():
- my_array, my_sparse = set_up()
- del(my_sparse[4])
- # if we delete the 4 position, should now be zero
- assert my_sparse[4] == 0
- # should have smaller length
- assert len(my_sparse) == 13
-
-
-def test_delete_zero():
- my_array, my_sparse = set_up()
- del my_sparse[5]
- # should still be zero, but should have shorter length
- assert my_sparse[5] == 0
- assert len(my_sparse) == 13
-
-
-def test_delete_last_number():
- my_array, my_sparse = set_up()
- del(my_sparse[13])
- # should get an error
- with pytest.raises(IndexError):
- my_sparse[13]
- assert len(my_sparse) == 13
-
-
-def test_indices_change():
- my_array, my_sparse = set_up()
- del(my_sparse[3])
- # next index should have changed
- # my_sparse[4] was 3 now
- # my_sparse[3] should be 3
- assert (my_sparse[3] == 3)
diff --git a/source/solutions/sparse_array/test_sparse_array.py b/source/solutions/sparse_array/test_sparse_array.py
deleted file mode 100644
index 06862292..00000000
--- a/source/solutions/sparse_array/test_sparse_array.py
+++ /dev/null
@@ -1,113 +0,0 @@
-"""
-This tests the solution that does not support slicing
-"""
-
-import pytest
-from sparse_array import SparseArray
-
-
-def set_up():
- my_array = [2, 0, 0, 0, 3, 0, 0, 0, 4, 5, 6, 0, 2, 9]
- my_sparse = SparseArray(my_array)
- return (my_array, my_sparse)
-
-
-def test_object_exists():
- my_array, my_sparse = set_up()
- assert isinstance(my_sparse, SparseArray)
-
-
-def test_get_non_zero_number():
- my_array, my_sparse = set_up()
- assert my_sparse[4] == 3
-
-
-def test_get_zero():
- my_array, my_sparse = set_up()
- assert my_sparse[1] == 0
-
-
-def test_get_element_not_in_array():
- my_array, my_sparse = set_up()
- with pytest.raises(IndexError):
- my_sparse[14]
-
-
-def test_get_length():
- my_array, my_sparse = set_up()
- assert len(my_sparse) == 14
-
-
-def test_change_number_in_array():
- my_array, my_sparse = set_up()
- my_sparse[0] = 3
- assert my_sparse[0] == 3
- # make sure others aren't changed
- assert my_sparse[1] == 0
- # make sure still same length
- assert len(my_sparse) == 14
-
-
-def test_change_number_in_array_to_zero():
- my_array, my_sparse = set_up()
- my_sparse[4] = 0
- assert my_sparse[4] == 0
- # make sure still same length
- assert len(my_sparse) == 14
-
-
-def test_change_number_in_array_from_zero():
- my_array, my_sparse = set_up()
- my_sparse[1] = 4
- assert my_sparse[1] == 4
- # make sure still same length
- assert len(my_sparse) == 14
-
-
-def test_delete_number():
- my_array, my_sparse = set_up()
- del(my_sparse[4])
- # if we delete the 4 position, should now be zero
- assert my_sparse[4] == 0
- # should have smaller length
- assert len(my_sparse) == 13
-
-
-def test_delete_zero():
- my_array, my_sparse = set_up()
- del(my_sparse[5])
- # should still be zero, but should have shorter length
- assert my_sparse[5] == 0
- assert len(my_sparse) == 13
-
-
-def test_delete_last_number():
- my_array, my_sparse = set_up()
- del(my_sparse[13])
- # should get an error?
- with pytest.raises(IndexError):
- my_sparse[13]
- assert len(my_sparse) == 13
-
-
-def test_indices_change():
- my_array, my_sparse = set_up()
- del(my_sparse[3])
- # next index should have changed
- # my_sparse[4] was 3 now
- # my_sparse[3] should be 3
- assert (my_sparse[3] == 3)
-
-
-# this is a way to tell pytest that you expect this test to fail
-@pytest.mark.xfail
-def test_get_slice():
- my_array, my_sparse = set_up()
- assert my_sparse[2:4] == [0, 0]
-
-
-@pytest.mark.xfail
-def test_set_slice():
- my_array, my_sparse = set_up()
- my_sparse[2:4] = [2, 3, 4]
- assert my_sparse[:] == [2, 0, 2, 3, 4, 3, 0, 0, 0, 4, 5, 6, 0, 2, 9]
diff --git a/source/supplemental/dev_environment/git_hints.rst b/source/supplemental/dev_environment/git_hints.rst
index 8c19196a..7221e9c2 100644
--- a/source/supplemental/dev_environment/git_hints.rst
+++ b/source/supplemental/dev_environment/git_hints.rst
@@ -248,8 +248,43 @@ There is a saying in the git world:
It's a good way to work -- branching and merging is easy enough it git that it pays off to do it often.
+"detached HEAD"
+---------------
+Above, we talked about using ``git checkout`` to restore a file to the state it was in in a previous commit, like so::
+ git checkout 8e5908a37d7d examples/Session05/maillroom_test.py
+
+But what happens if you do a checkout with a commit, and no specific file?
+
+It does what you might expect -- puts ALL the files back the way they were at that commit. But there is a hitch ... let's see what happens when I do that::
+
+ $ git checkout c03bb5b2c401c
+ Note: checking out 'c03bb5b2c401c'.
+
+ You are in 'detached HEAD' state. You can look around, make experimental
+ changes and commit them, and you can discard any commits you make in this
+ state without impacting any branches by performing another checkout.
+
+ If you want to create a new branch to retain commits you create, you may
+ do so (now or later) by using -b with the checkout command again. Example:
+
+ git checkout -b <new-branch-name>
+
+ HEAD is now at c03bb5b adding print_grid from class
+
+So the files are set to the old state -- but now there is that note about "detached HEAD" -- this means that changes you make, even commits, will not effect the git repo. IF you want to start from here and make changes that will stick, you need to do what it says, and make a new branch. But what it DOESN'T tell you is how to simpel "re-attach" the HEAD. Turns out there is an easy way::
+
+ $ git checkout -
+ Previous HEAD position was c03bb5b adding print_grid from class
+ Switched to branch 'master'
+ Your branch is up to date with 'origin/master'.
+
+the dash means "the branch or commit you were on before your last checkout command".
+
+For more info about "detached HEAD", see:
+
+https://howtogit.net/recipes/getting-out-of-detached-head-state.html
diff --git a/source/supplemental/dev_environment/index.rst b/source/supplemental/dev_environment/index.rst
index 8eb96522..9f98c5cf 100644
--- a/source/supplemental/dev_environment/index.rst
+++ b/source/supplemental/dev_environment/index.rst
@@ -278,13 +278,16 @@ http://www.sublimetext.com/
:ref:`sublime_as_ide`
-
"Atom" is another good open source option.
https://atom.io/
:ref:`atom_as_ide`
+"Visual Studio Code" is a relatively new cross platfrom offering from Microsoft -- a lot of folks seem to like it:
+
+:ref:`vsc_as_ide`
+
And, of course, vim or Emacs on Linux, if you are familiar with those.
Why No IDE?
@@ -377,7 +380,7 @@ You should be able to run git on the command line:
.. code-block:: bash
$ git --version
- git version 2.11.0 (Apple Git-81)
+ git version 2.20.1 (Apple Git-117)
It should be version >= 2
@@ -404,6 +407,7 @@ Specific Documentation
sublime_as_ide
atom_as_ide
+ vsc_as_ide
command_line
shell
ipython
diff --git a/source/supplemental/dev_environment/sublime_as_ide.rst b/source/supplemental/dev_environment/sublime_as_ide.rst
index 65f0208e..1f96594a 100644
--- a/source/supplemental/dev_environment/sublime_as_ide.rst
+++ b/source/supplemental/dev_environment/sublime_as_ide.rst
@@ -34,6 +34,7 @@ And some more advanced features that you may want later:
Which Version?
==============
+
Use version 3 -- it is updated now and again, so make sure to get the latest.
*Use Sublime Version 3*
@@ -42,7 +43,9 @@ Use version 3 -- it is updated now and again, so make sure to get the latest.
Basic Settings
==============
-All configuration in Sublime Text is done via `JSON <http://www.json.org>`_. It's simple to learn. go and read that link then return here. [Note that JSON is very similar to Python dict and list literals]
+All configuration in Sublime Text is done via `JSON <http://www.json.org>`_. It's simple to learn. Go and read that link then return here.
+
+.. note:: JSON is very similar to Python dict and list literals. Though it has its root in Javascript, it is also used in a wide variety of applications, and is well supported by Python. But a key difference is that it does not allow trailing commas after items in lists -- so be careful.
There are a number of `different levels of configuration <http://www.sublimetext.com/docs/3/settings.html>`_ in Sublime Text. You will most often work on settings at the user level.
@@ -86,7 +89,7 @@ Here's a reasonable set of preliminary settings (theme, color scheme and font ar
**NOTE:** Especially important is the setting ``translate_tabs_to_spaces``, which ensures that any time you hit a tab key, the single <tab> character is replaced by four <space> characters. In Python this is **vital**!
-If you do nothing else, add this for your config!
+If you do nothing else, add ``translate_tabs_to_spaces`` to your config!
Extending the Editor
====================
@@ -125,7 +128,7 @@ Anaconda
There are a bunch of Python-related plugins available. However, Anaconda is a nice package that provides most of the features you want, so plan on using just that one.
-Not to be confused with the Scientific Python distribution -- the Anaconda sublime plugin is a full featured package to turn Sublime into a pretty full IDE:
+Not to be confused with the scientific Python distribution -- the Anaconda sublime plugin is a full featured package to turn Sublime into a pretty full IDE:
http://damnwidget.github.io/anaconda/
@@ -144,7 +147,9 @@ A few settings you'll want to change
There are a few setting you may want to change:
-* max line length for the linter: default is 72, which is pretty short these day. I use 95
+* max line length for the linter: default is 72, which is pretty short these day. I use 95::
+
+ "pep8_max_line_length": 95,
White Space Management
@@ -171,13 +176,7 @@ You'll probably want to wait on this until you start using a debugger, but it's
The final requirement for a reasonable IDE experience is to be able to follow a debugging session in the file where the code exists.
-There is no plugin for Sublime Text that supports this. But there is a Python package you can install.
-
-The package is called `PDBSublimeTextSupport <https://pypi.python.org/pypi/PdbSublimeTextSupport>`_ and its simple to install with ``pip``:
-
-.. code-block:: bash
-
- $ python -m pip install PDBSublimeTextSupport
-With that package installed in the Python that is used for your project, any breakpoint you set will automatically pop to the surface in Sublime Text. And as you step through the code, you will see the current line in your Sublime Text file move along with you.
+This: https://packagecontrol.io/packages/Python%20Debugger
+Looks promising as a debugger plugin for sublime.
diff --git a/source/supplemental/dev_environment/vsc_as_ide.rst b/source/supplemental/dev_environment/vsc_as_ide.rst
new file mode 100644
index 00000000..98a0826b
--- /dev/null
+++ b/source/supplemental/dev_environment/vsc_as_ide.rst
@@ -0,0 +1,78 @@
+.. _vsc_as_ide:
+
+####################################################
+Using Visual Studio Code as a lightweight Python IDE
+####################################################
+
+Visual Studio Code is an extensible and customizable text editor from Microsoft that provides a very minimal layout with additional tooling such as an excellent built-in terminal.
+
+
+Requirements
+============
+
+Any IDE should ease your development experience by providing the following:
+
+* It should provide excellent, configurable syntax colorization.
+* It should allow for robust tab completion.
+* It should offer the ability to jump to the definition of symbols in other files.
+* It should perform automatic code linting to help avoid silly mistakes.
+* It should be able to interact with a Python interpreter such that when debugging, the editor will follow along with the debugger.
+
+Visual Studio Code requires that you perform some setup out of the box (see below for details).
+
+
+Which Version?
+==============
+
+There's just the latest version available to download.
+
+This ensures that all recent bug fixes and updates have been made.
+
+Visual Studio Code runs on Macs, Windows, and Linux flavors like Ubuntu, Debian, Red Hat, etc.
+
+Also, Visual Studio Code performs updates on itself, so there's no need to download newer versions of the app... you should already have it.
+
+Installation
+============
+
+Check out this solid video_ that will walk you through the process of setting up Visual Studio Code for Python in detail.
+
+.. _video: https://www.youtube.com/watch?v=TILIcrrVABg/
+
+Go to the Visual Studio Code website_.
+
+.. _website: https://code.visualstudio.com/
+
+Scroll down to the bottom of the page and you'll see links for installers to all the major OS platforms.
+
+Download your flavor and run the installer.
+
+
+Basic Settings
+==============
+
+Visual Studio Code can be used out of the box with no setup as a text editor. It automatically
+recognizes file types and helpfully highlights text accordingly. To use in this manner,
+write your Python files in Visual Studio Code, then run them in your Python command prompt
+or Visual Studio Code's own built in terminal: Ctrl + \` (control-backtick)
+
+
+Extending the Editor
+====================
+
+After you've install Visual Studio Code, there are many ways to extend it for working with Python.
+
+The video linked above goes into this much deeper.
+
+There is also a great tutorial for setting up Python here_.
+
+.. _here: https://code.visualstudio.com/docs/python/python-tutorial
+
+If you're on a Mac, be sure to set up your path_ for easy integration with the terminal.
+
+.. _path: https://code.visualstudio.com/docs/setup/mac
+
+I also recommend setting up Visual Studio Code as your default_ Git editor.
+
+.. _default: https://stackoverflow.com/questions/30024353/how-to-use-visual-studio-code-as-default-editor-for-git
+
diff --git a/source/supplemental/installing/python_for_windows.rst b/source/supplemental/installing/python_for_windows.rst
index 11c42411..1dca6fd8 100644
--- a/source/supplemental/installing/python_for_windows.rst
+++ b/source/supplemental/installing/python_for_windows.rst
@@ -40,7 +40,7 @@ Terminal
If you are confident in your use of the "DOS Box" or "powershell", command lines, feel free to use one of those. However, your life may be easier if you install "Git Bash", as then you can follow unix-style terminal instructions exactly, and do not have to translate. Also, your instructors are more experienced with Bash.
-From now on, if you hear the terms "bash", "shell" or "terminal", or "commandline" know that this is the application that is being referred to. We will use those terms interchangably to mean ANY command line.
+From now on, if you hear the terms "bash", "shell" or "terminal", or "command line" know that this is the application that is being referred to. We will use those terms interchangeably to mean ANY command line.
When you install Git Bash, you are installing git (and a git gui) as well, thus killing two birds with one stone!
@@ -51,7 +51,7 @@ You can go through the rest of the prompts using default values. Once you are do
You can use this git with the DOS box or Powershell as well.
-This is also a good bet for running Python -- If you use the Git Bash shell, you can use the same commands as Linux and OS-X users. Regardless of which shell you choose, you will need to add Python to your environment. It is possible that this was done during the installation of Python. If you type 'which python' into your terminal, and get back the answer '/c/python34/python', then you are good to go, otherwise (which shouldn't happen if you checked the "Add Python 3.7 to PATH" checkbox when you installed Python above), follow the instructions here:
+This is also a good bet for running Python -- If you use the Git Bash shell, you can use the same commands as Linux and OS-X users. Regardless of which shell you choose, you will need to add Python to your environment. It is possible that this was done during the installation of Python. If you type 'which python' into your terminal, and get back the answer '/c/python37/python', then you are good to go, otherwise (which shouldn't happen if you checked the "Add Python 3.7 to PATH" checkbox when you installed Python above), follow the instructions here:
http://www.computerhope.com/issues/ch000549.htm
@@ -99,7 +99,9 @@ Type ``ctrl+Z`` to get out (or ``exit()``)
Note: if you have trouble running ``python`` command in your gitbash (it hangs), try running this instead: ``winpty python``. To avoid having to type ``winpty python`` all the time, it's strongly recommended that you create an alias like below:
- $ echo "alias python='winpty python'" >> ~/.bashrc
+::
+
+ $ echo "alias python='winpty python'" >> ~/.bash_profile
You will need to close the current bash window and restart a new one to get this alias. Then from now on, you can just type ``python`` and it should work on git bash (no more hanging) as well.
@@ -126,7 +128,7 @@ It should download and install the latest ``pip``.
You can now use pip to install other packages.
- The first thing you may want to do is update pip itself:
+The first thing you may want to do is update pip itself:
.. code-block:: bash
@@ -169,7 +171,7 @@ You should now be able to run ``iPython`` from the git bash shell or "DOS Box" o
IPython 6.1.0 -- An enhanced Interactive Python. Type '?' for help.
(or from the DOS box or PowerShell prompt)
-We will use this as our default Python interpreter.
+We will use this in class as our default Python interpreter.
Testing it out
@@ -185,7 +187,7 @@ All available from the command line.
To try it out, you should be able to run all of these commands, and get something like the following results:
-(recall that you can get out of the python or iPython command lines with ``ctrl+Z``)
+(recall that you can get out of the python or iPython command lines with ``ctrl+Z`` (if that doesn't work, try ``ctrl+D`` -- the \*nix version))
For Python:
@@ -207,7 +209,7 @@ For iPython:
Python 3.7.0 (v3.7.0:1bf9cc5093, Jun 27 2018, 04:59:51) [MSC v.1914 64 bit (AMD64)]
Type 'copyright', 'credits' or 'license' for more information
IPython 6.5.0 -- An enhanced Interactive Python. Type '?' for help.
-
+
In [1]:
Do you really want to exit ([y]/n)? y