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

docs: amend makefile command; address warning #2951

Merged

Conversation

sadielbartholomew
Copy link
Collaborator

Close #2950 & also amend an RST format title underline which is a character too short, introducing a sphinx-build warning [.../site-user-config-ref.rst:183: WARNING: Title underline too short.].

With this PR, running both the explicit cylc make-docs command & make (in the overarching i.e. $CYLC_DIRdirectory) will build the docs cleanly.

@sadielbartholomew sadielbartholomew added the bug Something is wrong :( label Feb 12, 2019
@sadielbartholomew sadielbartholomew added this to the cylc-8.0.0 milestone Feb 12, 2019
@sadielbartholomew sadielbartholomew self-assigned this Feb 12, 2019
@sadielbartholomew sadielbartholomew changed the title docs: amend top-level makefile command & address build warning docs: amend top-level makefile command & cause of warning Feb 12, 2019
@sadielbartholomew sadielbartholomew changed the title docs: amend top-level makefile command & cause of warning docs: amend makefile command & address warning Feb 12, 2019
@sadielbartholomew sadielbartholomew changed the title docs: amend makefile command & address warning docs: amend makefile command; address warning Feb 12, 2019

URL of the online cylc documentation.

[documentation] ``->`` [[local]]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Path where the Cylc documentation will appear if built locally.
Path where the cylc documentation will appear if built locally.
Copy link
Member

Choose a reason for hiding this comment

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

Isn't that Cylc, as in Cylc project? Just out of curiosity, because I normally use Cylc for project name, and cylc for command name.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

True, I agree it should really be the capitalised form in general, so I originally went in to change another line nearby, but then I saw that all nearby content used the lower-case variant. I then did a quick skim through a sample of the rest of the docs, where the lower case seemed to be used.

So I made this change for consistency. Sorry, I probably should have clarified that in the opening comment. (As an aside I am not quite pedantic enough to go through & via grepping & checking blitz the entire docs to convert non-command etc. references from cylc to Cylc, even if that is preferred!)

Copy link
Member

Choose a reason for hiding this comment

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

Not a problem. Thanks for clarifying Sadie!

Copy link
Member

Choose a reason for hiding this comment

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

I originally wrote "Cylc" (the project) as "cylc" too, but was eventually persuaded by a manager that it stands out more in documents if capitalized. But there's still a mix of cases in the user guide (my fault!).

Copy link
Member

@kinow kinow left a comment

Choose a reason for hiding this comment

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

Looks good to me. Tried cylc make-docs and it worked fine, without any warnings/errors. It's also quite quick.

Only interesting that I didn't have sphinx-build the first time I ran it, but it still took a while doing something. Or at least it said generating the command reference.

Maybe it would be sensible to fail quick if no sphinx-build in the $PATH?

Oh, also confirmed that the ^^^..^^^ fixed the only warning I had building in master.

Added one comment about a word used, but not a blocker IMO. 👏

@sadielbartholomew
Copy link
Collaborator Author

sadielbartholomew commented Feb 13, 2019

Only interesting that I didn't have sphinx-build the first time I ran it, but it still took a while doing something. Or at least it said generating the command reference.

Ah yes, very good point! I noticed that too during the docs conversion, but never thought to go in & rectify it given a large checklist of items to get right for the docs conversion. Regrettably, as it would have ultimately saved me time!

It is the simply that the command reference RST file needs to be generated from the command docstrings / --help content via make-commands.sh, and that needs to be run before the sphinx-build else it will fail on a missing file.

Maybe it would be sensible to fail quick if no sphinx-build in the $PATH?

This sounds like a good way to get around the issue. Feel free to add that in to cylc make-docs if you feel it is worth it, though it might not be depending on how soon we can, as discussed, replace that command with a build via setup.py...

@oliver-sanders oliver-sanders merged commit 6dea703 into cylc:master Feb 15, 2019
@sadielbartholomew sadielbartholomew deleted the i2950-top-level-makefile branch April 3, 2019 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :(
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants