Merge remote-tracking branch 'upstream/master'

Author: pathcl

.gitignore

@@ -105,3 +105,11 @@ ENV/
 days/91-93-sqlalchemy/demo/persistent_rps/db/rock_paper_scissors.sqlite
 days/91-93-sqlalchemy/demo/persistent_rps_starter/.vscode/settings.json
 rock_paper_scissors.sqlite
+
+# Gimp
+*.xcf
+
+# TexturePacker
+*.tps
+
+**.DS_Store

README.md

@@ -1,4 +1,6 @@
 # #100DaysOfCode with Python course
+[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/talkpython/100daysofcode-with-python-course.git/master)
+
 
 [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/pathcl/100daysofcode-with-python-course.git/master)
 

days/01-03-datetimes/README.md

@@ -22,7 +22,7 @@ Work on *Bite 7 - Parsing dates from logs* for your second day of learning datet
 
 Edit: We decided to simplify Bite 7 slightly after some feedback we received from students. We've now removed the requirement to read in the file which should keep the Bite focused on the theme.
 
-Additionally, we've added another Bite that should be more appropriate for beginners. Unlock it here: [https://codechalleng.es/bites/promo/datetimes_starter](https://codechalleng.es/bites/promo/datetimes_starter)
+Additionally, we've added another TWO free Bites that should be more appropriate for beginners. Unlock them here: [https://codechalleng.es/bites/promo/datetimes_starter](https://codechalleng.es/bites/promo/datetimes_starter) and [https://codechalleng.es/bites/promo/more-datetimes](https://codechalleng.es/bites/promo/more-datetimes).
 
 
 ## Day N+2: Your Turn!
@@ -33,11 +33,12 @@ A fun project would be to create yourself a Pomodoro Timer that incorporates dat
 
 This could also be applied to a stopwatch app. Use time of course but also throw in the timestamps and even some basic calculations on the difference between the start and end timestamps.
 
+We encourage you to _pull request_ your work via [PyBites Code Challenge #52](https://codechalleng.es/challenges/52/). Have fun!
 
 ### Time to share what you've accomplished!
 
 Be sure to share your last couple of days work on Twitter or Facebook. Use the hashtag **#100DaysOfCode**. 
 
 Here are [some examples](https://twitter.com/search?q=%23100DaysOfCode) to inspire you. Consider including [@talkpython](https://twitter.com/talkpython) and [@pybites](https://twitter.com/pybites) in your tweets.
 
-*See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).*
+*See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).*

days/04-06-collections/README.md

@@ -0,0 +1,32 @@
+# Collections module
+
+## Day 1: Your new data structure friends
+
+Welcome to this lesson. Today you will learn about some powerful new data structures: `namedtuple`, `defaultdict`, `Counter` and `deque`.
+
+Today you watch the videos. I also prepared a [Jupyter notebook](https://github.com/talkpython/100daysofcode-with-python-course/blob/master/days/04-06-collections/collections.ipynb) so you can follow along with this lesson.
+
+## Day 2: Practice using movie data
+
+You get to use these new data structures I encourage you to code an exercise: [PyBites Code Challenge 13 - Highest Rated Movie Director](https://pybit.es/codechallenge13.html). 
+
+See the [notebook](https://github.com/talkpython/100daysofcode-with-python-course/blob/master/days/04-06-collections/collections.ipynb) for more info how to complete this exercise.
+
+You can also take a slimmed down version of this exercise [on our platform](https://codechalleng.es/bites/30/).
+
+## Day 3: More practice on your own data
+
+We challenge you to find your own data set and try to use the new collections data structures yourself.
+
+Stuck at finding examples? We used `collections` quite a bit for [when we did the 100 Days of Code](https://github.com/pybites/100DaysOfCode/blob/master/LOG.md):
+
+	$ python module_index.py |grep collections
+	collections        | stdlib | 001, 021, 023, 034, 036, 042, 045, 055, 057, 063, 076, 084, 086, 095, 096
+
+## Time to share what you've accomplished!
+
+Be sure to share your last couple of days work on Twitter or Facebook. Use the hashtag **#100DaysOfCode**.
+
+Here are [some examples](https://twitter.com/search?q=%23100DaysOfCode) to inspire you. Consider including [@talkpython](https://twitter.com/talkpython) and [@pybites](https://twitter.com/pybites) in your tweets.
+
+See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).

days/10-12-pytest/README.md

@@ -14,7 +14,7 @@ Be warned: mastering `pytest` might feel like possessing a super power!
 
 ## Day N: Setup + Learn pytest
 
-Today you will pip install `pytest` and `pytest-cov` and watch the video lectures. 
+Today you will pip install `pytest` and `pytest-cov` (best practice is to use a [virtual environment](https://pybit.es/the-beauty-of-virtualenv.html)) and watch the video lectures. 
 
 Start thinking about how you can write tests for your code ...
 

days/13-15-text-games/README.md

@@ -74,7 +74,7 @@ def game_loop(player1, player2, rolls):
     # Compute who won
 ```
 
-Bonus points for address the possibility of a tie after three rounds.
+Bonus points if you address the possibility of a tie after three rounds.
 
 ## Day 15: Tidy up standard **Rock, Paper, Scissors**
 
@@ -116,4 +116,4 @@ Be sure to share your last couple of days work on Twitter or Facebook. Use the h
 
 Here are [some examples](https://twitter.com/search?q=%23100DaysOfCode) to inspire you. Consider including [@talkpython](https://twitter.com/talkpython) and [@pybites](https://twitter.com/pybites) in your tweets.
 
-*See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).*
+*See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).*

days/13-15-text-games/data/sample_reader.py

@@ -15,8 +15,8 @@ def read_roll(row: dict):
     print("Roll: {}".format(name))
     for k in row.keys():
         can_defeat = row[k].strip().lower() == 'win'
-        print(" * {} will default {}? {}".format(name, k, can_defeat))
+        print(" * {} will defeat {}? {}".format(name, k, can_defeat))
 
     print()
 
-read_rolls()
+read_rolls()

days/13-15-text-games/rps15.jpg

@@ -0,0 +1,33 @@
+# List comprehensions and generators
+
+## Day 1: Ready to learn some powerful, Pythonic concepts?
+
+> List comprehensions and generators are in my top 5 favorite Python features leading to clean, robust and Pythonic code.
+
+Welcome to this lesson. In today's videos you will learn two powerful techniques you can use in Python: list comprehensions and generators.
+
+I prepared a [Jupyter notebook](https://github.com/talkpython/100daysofcode-with-python-course/blob/master/days/16-18-listcomprehensions-generators/list-comprehensions-generators.ipynb) so you can follow along with this lesson.
+
+## Day 2: Practice!
+
+Look at your code and see if you can refactor it to use list comprehensions. Same for generators. Are you building up a list somewhere where you could potentially use a generator?
+
+[My notebook](https://github.com/talkpython/100daysofcode-with-python-course/blob/master/days/16-18-listcomprehensions-generators/list-comprehensions-generators.ipynb) has an exercise to sink your teeth in. Please try it and tomorrow I will discuss the solution.
+
+## Day 3: Solution / simulate unix pipelines
+
+I will detail the solution of yesterday's exercise [in my notebook](https://github.com/talkpython/100daysofcode-with-python-course/blob/master/days/16-18-listcomprehensions-generators/list-comprehensions-generators.ipynb)
+
+Today if you have time left, I encourage you to try 2 extra exercises [on our platform](https://codechalleng.es):
+- [Bite 5. Parse a list of names](https://codechalleng.es/bites/5/) (use a set comprehension in first function)
+- [Bite 26. Dictionary comprehensions are awesome](https://codechalleng.es/bites/promo/awesome-dict-comprehensions)
+
+If you still have time left, or you prefer to practice generators check out this cool blog code challenge: [Code Challenge 11 - Generators for Fun and Profit](https://codechalleng.es/challenges/11/)
+
+## Time to share what you've accomplished!
+
+Be sure to share your last couple of days work on Twitter or Facebook. Use the hashtag **#100DaysOfCode**.
+
+Here are [some examples](https://twitter.com/search?q=%23100DaysOfCode) to inspire you. Consider including [@talkpython](https://twitter.com/talkpython) and [@pybites](https://twitter.com/pybites) in your tweets.
+
+See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).

days/16-18-listcomprehensions-generators/README.md

@@ -16,6 +16,10 @@ After watching the first 4 videos pop into your Python shell and start playing a
 
 Yep that's right! For your second day, use itertools to create a script that simulates traffic lights!
 
+The idea is to perhaps... *cycle* (hint hint!) through the different colours of a set of traffic lights - red, amber and green - printing the name of the colour every time the cycle occurs. 
+
+For bonus points: traffic lights normally cycle between green and red based on traffic levels so you never know exactly when the change will happen. This is a great chance to throw some randomness into your script.
+
 If you get absolutely stuck, watch the *Traffic Lights* video to see how we did it.
 
 
@@ -40,4 +44,4 @@ Be sure to share your last couple of days work on Twitter or Facebook. Use the h
 
 Here are [some examples](https://twitter.com/search?q=%23100DaysOfCode) to inspire you. Consider including [@talkpython](https://twitter.com/talkpython) and [@pybites](https://twitter.com/pybites) in your tweets.
 
-*See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).*
+*See a mistake in these instructions? Please [submit a new issue](https://github.com/talkpython/100daysofcode-with-python-course/issues) or fix it and [submit a PR](https://github.com/talkpython/100daysofcode-with-python-course/pulls).*