Skip to content
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

PR: Conform tutorial to docs style guide and further minor improvements #7659

Merged
merged 12 commits into from Aug 10, 2018

Conversation

CAM-Gerlach
Copy link
Member

Pull Request Checklist

  • Read and followed this repo's Contributing Guidelines
  • Based your PR on the latest version of the correct branch (master or 3.x)
  • Followed PEP8 for code style
  • Ensured your pull request hasn't eliminated unrelated blank lines/spaces,
    modified the spyder/defaults directory, or added new icons/assets
  • Described your changes and the motivation for them below
  • Noted what issue(s) this pull request resolves, creating one if needed

Description of Changes

A follow-on to #7641 / #7643 with the primary purpose of conforming the tutorial to our doc style guide to further enhance its appearance and external consistency, and also improve maintainability and internal consistency between them. Also, fixed some minor typos and refined the prose and formatting. See #7652 for the full list of what was done.

The final version was built with Sphinx in nitpicky mode, with no issues reported and the result was examined to confirm everything rendered well; also, it was run through Sphinx linkcheck with all green. Finally, it was examined as it will appear to users in Spyder itself reading through all sections, and no issues were found except for an issue where if ref tags (.. _section-ref:) were placed before section headers, that header would no longer collapse once expanded. Presumably, this is a bug in Spyder's help viewer (likely whatever custom HTML/CSS/JS is used for the collapsible sections), but to work around it with minimal consequences, the reference tags were simply placed after the section headers, which worked just fine (since the links were already named manually).

Overall, while the style guide changes approved in spyder-ide/spyder-docs#13 was implemented as in that issue, minimal content changes were made (compared to the previous PR); only typo fixes and minor language and format refinements, so hopefully this should be an easy review.

Thanks!

Issue(s) Resolved

Fixes #7652

@ccordoba12
Copy link
Member

ccordoba12 commented Aug 10, 2018

it was examined as it will appear to users in Spyder itself reading through all sections, and no issues were found

Ok, I'll trust you on this one because I don't have time to test it locally.

@ccordoba12 ccordoba12 merged commit 802ad62 into spyder-ide:3.x Aug 10, 2018
ccordoba12 added a commit that referenced this pull request Aug 10, 2018

* We are going to use this program as a first example:
We are going to use run program as a first example:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have changed "this" to "run". Did you mean to change "use" to "run" instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, thanks. I make embarrassing mistakes like that quite a bit when editing, and have a hard time noticing them since I tend to read what I meant, and not what I wrote.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!


If this is your first time, you should see an output like this::
#. If this is your first running something, you should see an output like this:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"time" was deleted in this change - was that accidental?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, thanks.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

doctoral training centre.
===============

This tutorial was originally based on `notes <https://fangohr.github.io/blog/spyder-the-python-ide-spyder-23.html>`__ by `Hans Fangohr <https://fangohr.github.io/>`__, that are used at the `University of Southampton <https://www.southampton.ac.uk/>`__ to `teach Python for computational modelling <https://www.southampton.ac.uk/~fangohr/teaching/python.html>`__ to undergraduate engineers and postgraduate PhD students for the `Next Generation Computational Modelling <http://www.ngcm.soton.ac.uk/>`__ doctoral training centre.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we please change the URL "https://www.southampton.ac.uk/~fangohr/teaching/python.html" to become "https://fangohr.github.io/teaching/python.html". The former link is likely to retire at some point.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, of course.

FYI, on that updated page itself you link back to the Southampton version of the tutorial rather than the one on your site.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated! Submitting a PR now.

@fangohr
Copy link
Contributor

fangohr commented Aug 22, 2018

This is a great pull request, improving the quality of the tutorial and Spyder. Many thanks for doing this; it looks good to me!

@CAM-Gerlach
Copy link
Member Author

Thanks so much for your kind words, Professor @fangohr .

@ccordoba12 Since the changes are small but noticeable (2 single-word typos, 2 tiny consistency tweaks, updating the URL and rewriting a sentence) any chance we can merge it to both 3.x and master or would it be too much work for you (since the file path of the tutorial was changed)? Either way I'll submit a PR with the changes against the appropriate branch as soon as you give me the word. Thanks!

@fangohr
Copy link
Contributor

fangohr commented Aug 23, 2018 via email

@CAM-Gerlach
Copy link
Member Author

@fangohr Yes, of course. Just wanted to point that out, heh.

@ccordoba12
Copy link
Member

any chance we can merge it to both 3.x and master

Sure, the fixes suggested by @fangohr can go to 3.x instead of master.

@CAM-Gerlach
Copy link
Member Author

@ccordoba12 @fangohr Thanks! Submitted as #7765 .

@CAM-Gerlach CAM-Gerlach deleted the tutorial-style-guide branch September 12, 2018 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants