Skip to content

Continued docs updates #10114

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

Merged
merged 8 commits into from
Mar 15, 2022
Merged

Conversation

jsquyres
Copy link
Member

@jsquyres jsquyres commented Mar 13, 2022

The first commit is some trivial docs updates on the main index page to match the text from the v4.0.x and v4.1.x docs (#10113 and #10112, respectively).

The 2nd commit is worthy of a detailed review: it deals with what version number to prominently display at the top of the front docs index page. Read the commit message for more details.

EDIT: Added a bunch of commits after the above initial description.

Fixes #10124

@jsquyres
Copy link
Member Author

While waiting for a review, I glommed on a few more commits with some more docs updates. 😄

@jsquyres jsquyres changed the title Trivial docs updates + version number display Continued docs updates Mar 13, 2022
Minor updates to match the top-level index.rst verbiage on the v4.0.x
and v4.1.x branches.

Signed-off-by: Jeff Squyres <[email protected]>
@jsquyres jsquyres force-pushed the pr/trivial-docs-updates branch 5 times, most recently from caa7ddd to 6c852a2 Compare March 15, 2022 16:50
@ibm-ompi
Copy link

The IBM CI (XL) build failed! Please review the log, linked below.

Gist: https://gist.github.com/ibm-ompi/88b480fb98dfd2bdac939f023e1f8fe6

@jsquyres jsquyres force-pushed the pr/trivial-docs-updates branch 2 times, most recently from 24f6876 to fef8eb8 Compare March 15, 2022 17:24
Having the Open MPI version at the top of the front index page is a
good, obvious visual indicator to the user to which version these docs
apply.

Usually, the version we display is derived from the contents of the
VERSION file.  However, when releasing Open MPI, we typically go back
and create an annotated git tag at a commit prior to the head of the
release branch.  This means that there is no git commit where the
VERSION file has an empty "greek" version.

As such, use the following scheme to determine what version string to
use for the RST macro "|ompi_ver|":

1. If there is an environment variable named READTHEDOCS_VERSION, use
   that (this env variable is documented here:
   https://docs.readthedocs.io/en/stable/builds.html#build-environment)
2. Otherwise, use the contents of the Open MPI VERSION file

Signed-off-by: Jeff Squyres <[email protected]>
Minor fixes and cleanups to the compilers-and-flags.rst page.

Signed-off-by: Jeff Squyres <[email protected]>
"make linkcheck" showed a bunch of stale links; fix most of them.

Also fix one RST minor error in the ULFM doc.

Signed-off-by: Jeff Squyres <[email protected]>
This was just added in open-mpi#10119.

Signed-off-by: Jeff Squyres <[email protected]>
Use the .readthedocs.yaml file to make ReadTheDocs fail the build if
there are Sphinx warnings.

Signed-off-by: Jeff Squyres <[email protected]>
@jsquyres jsquyres force-pushed the pr/trivial-docs-updates branch from fef8eb8 to 9e63d71 Compare March 15, 2022 17:37
@jsquyres
Copy link
Member Author

@bwbarrett It took a bunch of tries, but I think I finally got it right: RTD provides some environment variables with the info that we want. See the "docs: show version at top of first page" commit on this PR.

@jsquyres jsquyres requested a review from bwbarrett March 15, 2022 17:43
@jsquyres
Copy link
Member Author

bot:aws:retest

Signed-off-by: Jeff Squyres <[email protected]>
Ensure to always include the non-generated man pages (i.e., the pages
that are simply nroff redirects to Sphinx-generated man pages).

Signed-off-by: Jeff Squyres <[email protected]>
@jsquyres jsquyres force-pushed the pr/trivial-docs-updates branch from 9e63d71 to 0548757 Compare March 15, 2022 20:37
@jsquyres
Copy link
Member Author

@bwbarrett I'm sorry to do this to you -- I just modified the last commit (man page updates -- I missed a few) and I fixed the OSHMEM man page distribution (i.e., added a new last commit) to fix #10124. This involved modifying docs/Makefile.am, and I'm not 100% confident in how I did it.

Could you review again?

@jsquyres jsquyres requested a review from bwbarrett March 15, 2022 20:38
Copy link
Member

@bwbarrett bwbarrett left a comment

Choose a reason for hiding this comment

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

I think the makefile changes are ok; I don't see anything wrong, but they kind of hurt my brain (but I think what we're doing is just brain hurting in general, not that there's a problem with this patch).

@jsquyres jsquyres merged commit 1b5dc73 into open-mpi:master Mar 15, 2022
@jsquyres jsquyres deleted the pr/trivial-docs-updates branch March 15, 2022 22:56
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.

master build failing trying to install oshcc and related man pages
3 participants