-
Notifications
You must be signed in to change notification settings - Fork 77
Adding lightning talk material - Dave Fugelso #5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
mark updating of codefellows mentions as completed
…syntax colorization
Added SSCwafel directory and a test file
…styling we want for the built slides
…ython Conflicts: Solutions/Session01/print_grid.py
Adding student directory for Rperkins, including Week 1 homework
My Python Homeworks
Session One homework Looking good! I wish I'd seen your lightning talk!
Nice work!
|
Wow! this has gotten rather tangled up... were you expermenting during Cris' class? We may need to re-clone and start again -- let's see if we can clean this up before or after class this week. |
|
Well, yea. I'm new to Github's 'Request Pull' mechanism. Should I have just All my files look okay, btw. Did I mess up something else? Dave On Oct 11 2014 3:02 PM, Christopher H.Barker, PhD wrote:
|
|
well, a single pull request is tied to a branch. So if you make one request then, commit a change to that branch, it will automatically get added to teh pull request, if I haven't merged it yet. But this issue here is that there is a LOT of changes all over the repo in this pull request. It looks like you were experimenting with merging in stuff from various other repos and branches. See if you can see the whole list of changes in your pull request -- it's big! A real git master could figure out how to clean this all up, but I suggest you may want to essentially start over -- do a new clone of the main repo, and then put your stuff back in by hand. -Chris |
…ession02 directory of my student directory
… 20th term correctly. Contains a useful docstring and some assertions for some basic testing.
…erm of the lucas function. Checked that it gives the correct result up to the 20th term of the Lucas fuction. Added some basic assertion tests.
…roth and first terms to give the nth term of the Fibonacci series. Will give nth term of arbitrary series given users specified zeroth and first terms to work from. Some basic assertion tests to show it computes the correct nth term in the series and a docstring giving some details on what the function does.
Adding session02 homework Looking good!
Ian M. Davis Homework Love those docstrings! Very nicely done. One thing -- it's not really worth catching the AssertionErrors -- they will get hit anyway, so not a lot of value added. But good form for Exceptions in general.
|
closing this -- re-submit when it's cleaned up. |
|
Hi Chris- I see what I did... that pull request number 5 is actually trying to I did a later pull request for session 2 homework and everything is Anyway, I think I'm good. Dave On Oct 13 2014 12:29 PM, Christopher H.Barker, PhD wrote:
|
|
yup -- looks good now. One suggestion -- avoid names with spaces in them. the tool sall work with them, but command line usage is a little uglier -- you need to escape the spaces, or use quotes. I use underscores or "StudlyCaps" to get easy to read names without spaces. |
No description provided.