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

[develop]: Update documentation to reflect recent (Feb '24) changes #72

Merged
merged 35 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
38be489
add extlinks & UFS/EPIC logo
gspetro-NOAA Feb 27, 2024
acf35b0
add linkcheck to doc Makefile
gspetro-NOAA Feb 27, 2024
69d8fc0
add/update requirements files
gspetro-NOAA Feb 27, 2024
bf0c526
update linkcheck redirects/ignores
gspetro-NOAA Feb 28, 2024
530bbbc
update tech overview; minor conf.py edits
gspetro-NOAA Feb 29, 2024
da59337
reorganize/add to Tech Overview
gspetro-NOAA Mar 1, 2024
a37765f
rm comments
gspetro-NOAA Mar 1, 2024
b6db7e0
update build/run ch w/config info
gspetro-NOAA Mar 1, 2024
77501a0
update configuration/run/status check info in build/run ch
gspetro-NOAA Mar 1, 2024
8360c8d
move info on data
gspetro-NOAA Mar 4, 2024
c513482
minor edits
gspetro-NOAA Mar 5, 2024
c18155c
update BASEDIR path in land_analysis.yaml
gspetro-NOAA Mar 5, 2024
dd0e7b9
merge in HEAD of develop
gspetro-NOAA Mar 5, 2024
adabbb2
add FAQ; rm info on log/err files from build/run ch
gspetro-NOAA Mar 5, 2024
1483476
change docs to doc
gspetro-NOAA Mar 5, 2024
362b890
update Glossary, uwtools desc; misc
gspetro-NOAA Mar 5, 2024
4a36599
update RTD YAML
gspetro-NOAA Mar 5, 2024
47f0aa4
minor fix to FAQ
gspetro-NOAA Mar 5, 2024
c154743
update LANDDAROOT path
gspetro-NOAA Mar 5, 2024
22abec9
minor edits from chj
gspetro-NOAA Mar 7, 2024
cdda677
Merge branch 'develop' into text/us-134
gspetro-NOAA Mar 7, 2024
9da4cf3
merge in develop
gspetro-NOAA Mar 7, 2024
572735b
add run w/o rocot info & jjobs info
gspetro-NOAA Mar 7, 2024
c0709e9
Merge branch 'text/us-134' of https://github.com/gspetro-NOAA/land-DA…
gspetro-NOAA Mar 7, 2024
72e7b37
update auto_doc.yaml to use doc instead of docs
gspetro-NOAA Mar 7, 2024
66244ee
update dir structure
gspetro-NOAA Mar 11, 2024
11b0440
add NCEP/NCO terms
gspetro-NOAA Mar 11, 2024
a88fcb1
update UW tools link
gspetro-NOAA Mar 11, 2024
8048283
complete sentence
gspetro-NOAA Mar 12, 2024
a4c9d62
Merge branch 'develop' into text/us-134
gspetro-NOAA Mar 13, 2024
91ebfab
update dir str diagram
gspetro-NOAA Mar 13, 2024
4e37837
Merge branch 'text/us-134' of https://github.com/gspetro-NOAA/land-DA…
gspetro-NOAA Mar 13, 2024
3ca5e15
update log file info and com dir str diagram
gspetro-NOAA Mar 13, 2024
cd297ba
minor build/run updates
gspetro-NOAA Mar 14, 2024
12a794b
add RTD integration to repo?
gspetro-NOAA Mar 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py
configuration: doc/source/conf.py

# If using Sphinx, optionally build your docs in additional formats such as PDF
# formats:
Expand All @@ -26,6 +26,6 @@ sphinx:
# Optionally declare the Python requirements required to build your docs
python:
install:
- requirements: docs/requirements.txt
- requirements: doc/requirements.txt


18 changes: 15 additions & 3 deletions docs/Makefile → doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,30 @@

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXOPTS = -a -n #-W
SPHINXBUILD ?= sphinx-build
SOURCEDIR = source
BUILDDIR = build
LINKCHECKDIR = $(BUILDDIR)/linkcheck

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile
.PHONY: help Makefile linkcheck

help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)

doc:
make clean
$(MAKE) linkcheck
$(MAKE) html

linkcheck:
$(SPHINXBUILD) -b linkcheck $(SPHINXOPTS) $(SOURCEDIR) $(LINKCHECKDIR)

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) -w $(BUILDDIR)/warnings.log
70 changes: 35 additions & 35 deletions docs/make.bat → doc/make.bat
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
@ECHO OFF
pushd %~dp0
REM Command file for Sphinx documentation
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=source
set BUILDDIR=build
%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.https://www.sphinx-doc.org/
exit /b 1
)
if "%1" == "" goto help
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
goto end
:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
:end
popd
@ECHO OFF

pushd %~dp0

REM Command file for Sphinx documentation

if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=source
set BUILDDIR=build

%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.https://www.sphinx-doc.org/
exit /b 1
)

if "%1" == "" goto help

%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
goto end

:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%

:end
popd
5 changes: 2 additions & 3 deletions docs/requirements.txt → doc/requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
sphinxcontrib-bibtex
sphinx>=6.0.0
sphinx_rtd_theme
docutils>=0.18.1
urllib3==1.26.15
sphinxcontrib-bibtex
76 changes: 76 additions & 0 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile requirements.in
#
alabaster==0.7.16
# via sphinx
babel==2.14.0
# via sphinx
certifi==2024.2.2
# via requests
charset-normalizer==3.3.2
# via requests
docutils==0.20.1
# via
# pybtex-docutils
# sphinx
# sphinx-rtd-theme
# sphinxcontrib-bibtex
idna==3.6
# via requests
imagesize==1.4.1
# via sphinx
jinja2==3.1.3
# via sphinx
latexcodec==2.0.1
# via pybtex
markupsafe==2.1.5
# via jinja2
packaging==23.2
# via sphinx
pybtex==0.24.0
# via
# pybtex-docutils
# sphinxcontrib-bibtex
pybtex-docutils==1.0.3
# via sphinxcontrib-bibtex
pygments==2.17.2
# via sphinx
pyyaml==6.0.1
# via pybtex
requests==2.31.0
# via sphinx
six==1.16.0
# via
# latexcodec
# pybtex
snowballstemmer==2.2.0
# via sphinx
sphinx==7.2.6
# via
# -r requirements.in
# sphinx-rtd-theme
# sphinxcontrib-bibtex
# sphinxcontrib-jquery
sphinx-rtd-theme==2.0.0
# via -r requirements.in
sphinxcontrib-applehelp==1.0.8
# via sphinx
sphinxcontrib-bibtex==2.6.2
# via -r requirements.in
sphinxcontrib-devhelp==1.0.6
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
# via sphinx
sphinxcontrib-jquery==4.1
# via sphinx-rtd-theme
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.7
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
urllib3==1.26.15
# via requests
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ When posting a question, it is recommended that users provide the following info
Bug Reports
============

If users (especially new users) believe they have identified a bug in the system, it is recommended that they first ask about the problem in `GitHub Discussions <https://github.com/ufs-community/land-DA_workflow/discussions/categories/q-a>`__, since many "bugs" do not require a code change/fix --- instead, the user may be unfamiliar with the system and/or may have misunderstood some component of the system or the instructions, which is causing the problem. Asking for assistance in a `GitHub Discussion <https://github.com/ufs-community/land-DA_workflow/discussions/categories/q-a>`__ post can help clarify whether there is a simple adjustment to fix the problem or whether there is a genuine bug in the code. Users are also encouraged to search `open issues <https://github.com/ufs-community/land-DA_workflow/issues>`__ to see if their bug has already been identified. If there is a genuine bug, and there is no open issue to address it, users can report the bug by filing a `GitHub Issue <https://github.com/ufs-community/land-DA_workflow/issues/new>`__.
If users (especially new users) believe they have identified a bug in the system, it is recommended that they first ask about the problem in :land-wflow-repo:`GitHub Discussions <discussions/categories/q-a>`, since many "bugs" do not require a code change/fix --- instead, the user may be unfamiliar with the system and/or may have misunderstood some component of the system or the instructions, which is causing the problem. Asking for assistance in a :land-wflow-repo:`GitHub Discussion <discussions/categories/q-a>` post can help clarify whether there is a simple adjustment to fix the problem or whether there is a genuine bug in the code. Users are also encouraged to search :land-wflow-repo:`open issues <issues>` to see if their bug has already been identified. If there is a genuine bug, and there is no open issue to address it, users can report the bug by filing a :land-wflow-repo:`GitHub Issue <issues/new>`.

Feature Requests and Enhancements
==================================
Expand Down
Loading