Skip to content

Commit 5105ce7

Browse files
authored
docs(prp): fix removal version of fraction option (#2126)
The PRP DFN described the fraction option has having been removed in 6.5.1, which never materialized. It was removed in 6.6.0 instead. Fix an mf6io document issue where deprecated/removed options remained in keystring descriptions. Add cffconvert to the project dependencies, add a corresponding pixi task, and use it in CI. There is some issue with the check cff action.
1 parent 2a063b9 commit 5105ce7

File tree

7 files changed

+25665
-34766
lines changed

7 files changed

+25665
-34766
lines changed

.codespellrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[codespell]
2-
skip = *.pdf,*.grb,*.bib,*.bst,*.log,./builddir,./src/Utilities/Libraries,./utils/mf5to6,./doc/ReleaseNotes/previous
2+
skip = *.pdf,*.grb,*.bib,*.bst,*.log,./builddir,./src/Utilities/Libraries,./utils/mf5to6,./doc/ReleaseNotes/previous,pixi.*
33
ignore-words = .codespell.ignore

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: pixi run check-python-format
6767

6868
- name: Check CITATION.cff
69-
uses: dieghernan/cff-validator@v3
69+
run: pixi run check-citations
7070

7171
build:
7272
name: Build

doc/mf6io/mf6ivar/dfn/prt-prp.dfn

+1-1
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,6 @@ tagged true
400400
in_record true
401401
reader urword
402402
optional true
403-
removed 6.5.1
403+
removed 6.6.0
404404
longname
405405
description release particles after the specified fraction of the time step has elapsed. If FRACTION is not set, particles are released at the start of the specified time step(s). FRACTION must be a single value when used with ALL, FIRST, or FREQUENCY. When used with STEPS, FRACTION may be a single value or an array of the same length as STEPS. If a single FRACTION value is provided with STEPS, the fraction applies to all steps. NOTE: The FRACTION option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block.

doc/mf6io/mf6ivar/mf6ivar.py

+5
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,11 @@ def write_desc(vardict, block, blk_var_list, varexcludeprefix=None):
413413
# s += '\\begin{verbatim}\n'
414414
s += "\\begin{lstlisting}[style=blockdefinition]\n"
415415
for vn in t.strip().split()[1:]:
416+
if (
417+
"removed" in vardict[(vn, block)]
418+
or "deprecated" in vardict[(vn, block)]
419+
):
420+
continue
416421
blockentry = block_entry(vn, block, vardict, "")
417422
s += f"{blockentry}\n"
418423
# s += '\\end{verbatim}\n\n'

environment.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ channels:
77
dependencies:
88
- python>=3.9
99
- appdirs
10+
- cffconvert
1011
- codespell
1112
- filelock
1213
- flaky

pixi.lock

+25,654-34,763
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = "6.7.0.dev0"
66

77
[dependencies]
88
appdirs = "*"
9+
cffconvert = "*"
910
codespell = "*"
1011
filelock = "*"
1112
flaky = "*"
@@ -109,6 +110,7 @@ build-dist = { cmd = "python build_dist.py", cwd = "distribution" }
109110
test-dist-scripts = { cmd = "pytest -v --durations 0", cwd = "distribution" }
110111
update-version = { cmd = "python update_version.py", cwd = "distribution" }
111112
deprecations = { cmd = "python deprecations.py", cwd = "doc/mf6io/mf6ivar" }
113+
check-citations = "cffconvert --validate -i CITATION.cff"
112114

113115
[feature.rtd.tasks]
114116
sphinx = { cmd = "make html", cwd = ".build_rtd_docs" }

0 commit comments

Comments
 (0)