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

Update docs infrastructure #2809

Draft
wants to merge 41 commits into
base: b4b-dev
Choose a base branch
from

Conversation

samsrabin
Copy link
Collaborator

@samsrabin samsrabin commented Oct 3, 2024

Description of changes

  • Removes dependence on outdated version of sphinx_rtd_theme
  • Enables embedding of Markdown docs in .rst files,
  • Adds Github workflow job to test documentation build whenever a PR is submitted with a branch from a fork that changes docs/
  • Adds Github workflow jobs to run for any PR with a branch from this repo that changes docs/:
    • Build and preview documentation on PR submission, update, or merge (untested)
    • Publish docs update on merge (untested)
  • Could rid us of the need for Docker and doc-builder (would require more testing; probably a different PR)

Specific notes

Note that this PR tests the workflow jobs that are run on PRs of branches from forks. Specifically, the doc building is tested, but nothing is previewed or published. That only happens for PRs of branches from this canonical ESCOMP/CTSM repo; see #2812 for testing of that.

Contributors other than yourself, if any: None

CTSM Issues Fixed (include github issue #):

Are answers expected to change (and if so in what way)? The way users switch between documentation versions will be different.

Any User Interface Changes (namelist or namelist defaults changes)? No

Testing performed, if any: Builds locally with no errors or warnings. Hopefully the version switching isn't broken—it looks broken locally, but I don't know if that's just an issue of it being local.

@samsrabin samsrabin added documentation additions or edits to user-facing documentation next this should get some attention in the next week or two. Normally each Thursday SE meeting. labels Oct 3, 2024
@samsrabin samsrabin added this to the ctsm6.0.0 (code freeze) milestone Oct 3, 2024
### Sam Rabin 2024-10-02: Commented out to resolve "WARNING: unsupported theme option 'versions' given". Might break things!
### html_theme_options = {}
### html_theme_options['versions'] = {version: ''}
### html_theme_options['versions']['[placeholder]'] = ''
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@jasonb5 In trying to move us off that old sphinx_rtd_theme fork, I made changes based on your PR at ESMCI/cime#4613. However, I was getting "WARNING: unsupported theme option 'versions' given" warnings until I commented out this bit. I see that CIME has it uncommented, though. Does that warning still happen for CIME, or is there something better I can do to resolve it?

@wwieder wwieder removed the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label Oct 3, 2024
@samsrabin samsrabin force-pushed the update-docs-builder-2 branch from f344a1e to ff003dd Compare October 3, 2024 19:42
@samsrabin samsrabin force-pushed the update-docs-builder-2 branch from ff003dd to c3788bb Compare October 3, 2024 19:48
@samsrabin samsrabin added the enhancement new capability or improved behavior of existing capability label Oct 3, 2024
Via updating doc-builder external to c51795f; branch update-20241002: Merge branch 'warnings-as-errors' into update-20241002
@samsrabin
Copy link
Collaborator Author

samsrabin commented Oct 3, 2024

  • Figure out why the above run of test-build (at ee94753) didn't fail.

@samsrabin samsrabin mentioned this pull request Oct 4, 2024
@samsrabin samsrabin changed the base branch from master to b4b-dev October 7, 2024 22:06
@samsrabin samsrabin added the PR status: awaiting review Work on this PR is paused while waiting for review. label Oct 8, 2024
@samsrabin samsrabin marked this pull request as draft October 8, 2024 16:19
@samsrabin samsrabin removed the PR status: awaiting review Work on this PR is paused while waiting for review. label Oct 8, 2024
@samsrabin
Copy link
Collaborator Author

samsrabin commented Oct 8, 2024

Will ask at CSEG meeting today if I can get a new ctsm-docs container approved (and built/pushed to Dockerhub) quickly. If not, I'll take the Markdown stuff out of this PR.

@samsrabin samsrabin self-assigned this Oct 8, 2024
Treat Sphinx warnings as errors by default.
@samsrabin samsrabin linked an issue Oct 31, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code health improving internal code structure to make easier to maintain (sustainability) documentation additions or edits to user-facing documentation enhancement new capability or improved behavior of existing capability test: none No tests required (e.g. tools/contrib) testing additions or changes to tests
Projects
Status: In Progress
Development

Successfully merging this pull request may close these issues.

Update doc-builder
2 participants