search

sandiegopython / intro-to-python

Introduction to Python (2014)
Creative Commons Attribution 4.0 International
28 stars 26 forks source link

Changes minor typos and adds links to python docs for random #13

Closed willingc closed 10 years ago

willingc commented 10 years ago

@audreyr Looks great. Fixed a typo or two.

Adds links to random module and randint function to the Python docs.

Just realized that I saved after clearing the notebook output. Please let me know if you prefer with or without output. Thx.

treyhunner commented 10 years ago

:+1:

I think it's fine without the output because we can always recreate it later.

I think we should go through and make the output consistently on/off and starting at output number 1 (if on) for all of the notebooks the night before the workshop. That way we don't have to worry about consistency in output much now.

audreyfeldroy commented 10 years ago

@willingc thanks for looking this over, and for the corrections! I still have to finish this and Part 5...I'll be online as I work on those tonight, around 8:30pm. I'll review/merge this then as well.

audreyfeldroy commented 10 years ago

Um, I have a really bad merge conflict with this. I'm trying to fix it now :(

audreyfeldroy commented 10 years ago

I'm in a huge panic right now. I lost a huge chunk of material. Trying to figure out what to do.

macro1 commented 10 years ago

@audreyr can you abort the merge and push up to a new branch? Someone else can take a stab at integrating the changes.

treyhunner commented 10 years ago

@audreyr feel free to message me in the Google Doc or hangouts if you want help with the conflict or this section.

audreyfeldroy commented 10 years ago

I'm working with @pydanny here now on trying to resolve the merge conflict. (I should have backed this up before merging)

treyhunner commented 10 years ago

Okay. I hope you salvage all your work.

If you find you're wasting too much time, feel free to commit it with conflicts and push it. I've (unfortunately) had to resolve a couple ipython notebook merge conflicts recently, so I might be able to help out.

willingc commented 10 years ago

Good luck @audreyr and @pydanny. I'm around all day tomorrow to help with any thing you need :)

audreyfeldroy commented 10 years ago

Thanks. It's a mess, but since I have to redo a bunch of it anyway to convert it from REPL style to .py style, I'm just starting over. I'll be working in my fork on this.

alaindomissy commented 10 years ago

Wow... Good luck... Audrey, I am very impressed with all your work. I hope its not too much.... Good night every body :-)

On Sun, Sep 14, 2014 at 10:47 PM, Audrey Roy notifications@github.com wrote:

Thanks. It's a mess, but since I have to redo a bunch of it anyway to convert it from REPL style to .py style, I'm just starting over. I'll be working in my fork on this.

— Reply to this email directly or view it on GitHub https://github.com/pythonsd/intro-to-python/pull/13#issuecomment-55554612 .