Skip to content

Conversation

@DamienIrving
Copy link
Contributor

At the moment the command line lesson (08-cmdline.html) begins by calling python scripts from within the IPython notebook (using %run script.py or !ipython script.py) and then about half way through the lesson it switches to calling scripts from the command line itself (i.e. $ python script.py). This is very confusing for learners and instructors, so I'm proposing that we just use the command line from beginning to end (i.e. don't even open an IPython notebook for this lesson - just teach it entirely from the command line).

This PR also fixes some little things towards the end of the lesson because no reference was made to readings-05.py or readings-06.py in the lesson notes.

@gvwilson
Copy link
Contributor

gvwilson commented Apr 18, 2015 via email

@wking
Copy link
Contributor

wking commented Apr 18, 2015

On Fri, Apr 17, 2015 at 08:35:23PM -0700, Damien Irving wrote:

M 08-cmdline.html (33)

The changes look good to me, but you shouldn't be contributing the
rebuilt HTML, since it increases the chance of a merge conflict, and
resolving merge conflicts in auto-generated content isn't worth the
trouble. See [1](point 3). Instead, the maintainers should
periodically rebuild the HTML from the master branch independently of
in-flight PRs.

@DamienIrving
Copy link
Contributor Author

Ah, thanks @wking - I should have read CONTRIBUTING.md more closely. Happy to re-submit the pull request without the .html file if the maintainers would prefer?

@tbekolay
Copy link
Contributor

No worries about the .html files being included; it's better practice to not include them, but not a hard and fast rule. Thanks for these changes, big improvement IMO!

@tbekolay tbekolay merged commit 134b4ba into swcarpentry:gh-pages Apr 20, 2015
@tbekolay tbekolay removed their assignment Oct 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants