makepst 0.4.0__tar.gz → 0.5.0__tar.gz

{makepst-0.4.0 → makepst-0.5.0}/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 0.5.0 (2026-09-29)
+
+- `tools/rule_sources.py`: are `validate`'s rules still current? `pestpp` re-reads PEST++'s option
+  parser from GitHub (names, aliases, types, choices, deprecations); `pestchek --source DIR` reads a
+  PEST download's `pestchek.F` / `cheksub.F` (control-data keywords and every message). Each is
+  compared with the reviewed snapshot in `tools/snapshots/` and with makePst's own tables; exit 1 on
+  a change, 2 when the source cannot be read; `--write` records a reviewed source. Tests hold
+  `makepst/pestpp.py` and the control-data schema to the snapshots, and a weekly GitHub workflow
+  (`.github/workflows/rule-sources.yml`) opens an issue when PEST++'s parser changes. The PEST++
+  registry is unchanged; its provenance now names commit 02e1455 (5.2.29) - the commit named before,
+  ad8428d, has identical option parsing but is labelled 5.2.28 in the source.
+
+- `build --dry_run`: the `validate` report on the control file a build would write, from a workbook's
+  BUILD sheet or from tables named on the command line; nothing is written, no manifest; exit 1 on
+  errors. A workbook with no BUILD sheet now says how to name its tables and check them this way.
+- `validate` on a workbook judges it as `build` would write it, after the same normalization
+  (regularisation equations from `PRIOR`/`WEIGHT`, unused groups removed, ties to fixed parameters
+  fixed), listing those as notes. It used to judge the tables before that and report errors building
+  removes: a regularisation file with no "regul" group, prior information not generated.
+
+- PEST_HP control variables are treated as `++` options are: a control-data token makePst does not
+  know (`newhpvar=7`, a new flag) is kept with the line it came from and written back there, instead
+  of being dropped, and `validate` warns about it with the closest known name. `dump` writes it to
+  the CONTROL sheet with its line (`control data line 4`), so `build` puts it back.
+- Every PEST_HP variable PEST 17.2's pestchek reads is now known: `run_slow_fac`, `run_abandon_fac`,
+  `jcowarnthresh`, `jcozerothresh`, `zerosenval`, `hardstophours`, `softstophours`, `reg2measrat`,
+  `orr_not_first`, and `obsreref_N`; `name = value` with spaces around `=` is read, as PEST_HP does.
+- `validate` checks that PEST can read each control value: an integer or a number where one is
+  expected (Fortran `1d-3` included), a known word for `precis`, `dpoint` and the other flags,
+  `absparmax(n)=value` with n 1-10; and the PEST_HP ranges and combinations (`RUN_ABANDON_FAC` 0 or
+  at least 1.2, not both stop-hours variables, `JCOZEROTHRESH` above `JCOWARNTHRESH`, `REG2MEASRAT`
+  below 1, `orr_not_first` and `ZEROSENVAL` only with what they need).
+- The rule sources are pinned and reported: `PESTCHEK_SOURCE_VERSION` (17.2) beside
+  `PESTPP_REGISTRY_VERSION` (5.2.29); `validate` prints both and every manifest records them under
+  `checked_against`.
+
 ## 0.4.0 (2026-09-27)
 
 - `rescale` / `Pst.rescale_par()`: move parameter values into `SCALE` so each selected parameter

{makepst-0.4.0 → makepst-0.5.0}/CITATION.cff

@@ -6,8 +6,8 @@ authors:
   - family-names: Ou
     given-names: Michael
     email: ougengxin@gmail.com
-version: 0.4.0
-date-released: 2026-09-27
+version: 0.5.0
+date-released: 2026-09-29
 repository-code: "https://github.com/ougx/makePst"
 license: MIT
 keywords:

{makepst-0.4.0 → makepst-0.5.0}/MANIFEST.in

@@ -1,5 +1,6 @@
 include LICENSE README.md CHANGELOG.md CITATION.cff
 recursive-include tests *.py *.xlsx *.pst *.par *.res *.csv
+recursive-include tools *.py *.json
 recursive-include examples/minimal *.csv *.py *.tpl *.ins *.in *.out *.par *.res
 prune examples/mnnrd
 global-exclude __pycache__ *.py[cod] *.manifest.json

{makepst-0.4.0 → makepst-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makepst
-Version: 0.4.0
+Version: 0.5.0
 Summary: Build PEST / PEST++ / PEST_HP control files from spreadsheet tables, read them back, and push results into the workbook
 Author-email: Michael Ou <ougengxin@gmail.com>
 License: MIT
@@ -486,8 +486,8 @@ the workbook?" even after the file was renamed or overwritten. `--check` adds a
 `provenance`: `unchanged` / `changed` / `missing`.
 
 ```
-2026-09-19 21:14 build      pest/tr13.pst <- tr13.xlsx  [1068 par 41747 obs 159 prior]  makepst 0.4.0
-2026-09-21 08:10 update     tr13-xlwings.xlsx <- tr13.xlsx, tr13.par  [1068 rows in 8 sheets]  makepst 0.4.0
+2026-09-19 21:14 build      pest/tr13.pst <- tr13.xlsx  [1068 par 41747 obs 159 prior]  makepst 0.5.0
+2026-09-21 08:10 update     tr13-xlwings.xlsx <- tr13.xlsx, tr13.par  [1068 rows in 8 sheets]  makepst 0.5.0
 ```
 
 ### bundle — a run, zipped for review
@@ -563,7 +563,8 @@ explicitly before writing.
 | parameter group defined but unused | fix available: remove the group |
 | prior equation referencing a fixed, tied or missing parameter | error and fix available: rebuild prior information, dropping those equations |
 | adjustable `PARVAL1` outside `[PARLBND, PARUBND]` | warning |
-| control value that is computed (`npar` …) or unknown | ignored (warning) |
+| control value that is computed (`npar` …) | ignored (warning) |
+| control variable makePst does not know (a newer PEST_HP keyword): kept on the line it came from; a CONTROL-sheet row gives that line in `LINE` (`control data line 4`) or is ignored | warning |
 
 `makepst validate` uses the same table checks and adds the **pestchek-style report**: it
 changes nothing, looks beyond the tables at the files the control file points to, and exits 1
@@ -582,7 +583,9 @@ makepst validate tr13.xlsx            # a workbook with a BUILD sheet is built f
 | malformed prior equation; non-numeric right-hand side; `log()` used on a non-log parameter or vice versa | error |
 | `DERCOM` beyond the number of model command lines | error |
 | name longer than PEST's limit (12 parameter / 20 observation / 12 group; PEST++ allows 200) | warning |
-| **pestchek's rules** (from PEST 17's `pestchek.F` / `cheksub.F`): `PARCHGLIM` vocabulary and `absolute(n)` needing `absparmax(n)=`; log parameters factor-limited with positive values; factor-limited bounds of one sign and non-zero; `SCALE ≠ 0`; tied to itself, tied or parent with initial value 0; group `none` reserved; all parameters fixed/tied; `INCTYP` / `FORCEN` / `DERMTHD` vocabularies and their compatibility; split-column ranges; duplicate groups; `dum` as an observation name; prior weights, labels (≤ 20, not an observation name), duplicated parameters, all-zero factors, group `predict`; regularisation needs a `regul*` group, prediction exactly one `predict` observation; ~60 control-variable range and consistency rules (`RLAMFAC`, `PHIRATSUF`, `FACPARMAX`, `NPHISTP`, `RELPARSTP < RELPARMAX`, `EIGTHRESH`, `PHIMLIM < PHIMACCEPT < 1.2·PHIMLIM`, `WFMIN ≤ WFINIT ≤ WFMAX`, `UPTESTMIN`/`UPTESTLIM`, SVD vs AUI vs LSQR exclusivity, …) | error |
+| **pestchek's rules** (from PEST 17.2's `pestchek.F` / `cheksub.F`): `PARCHGLIM` vocabulary and `absolute(n)` needing `absparmax(n)=`; log parameters factor-limited with positive values; factor-limited bounds of one sign and non-zero; `SCALE ≠ 0`; tied to itself, tied or parent with initial value 0; group `none` reserved; all parameters fixed/tied; `INCTYP` / `FORCEN` / `DERMTHD` vocabularies and their compatibility; split-column ranges; duplicate groups; `dum` as an observation name; prior weights, labels (≤ 20, not an observation name), duplicated parameters, all-zero factors, group `predict`; regularisation needs a `regul*` group, prediction exactly one `predict` observation; ~60 control-variable range and consistency rules (`RLAMFAC`, `PHIRATSUF`, `FACPARMAX`, `NPHISTP`, `RELPARSTP < RELPARMAX`, `EIGTHRESH`, `PHIMLIM < PHIMACCEPT < 1.2·PHIMLIM`, `WFMIN ≤ WFINIT ≤ WFMAX`, `UPTESTMIN`/`UPTESTLIM`, SVD vs AUI vs LSQR exclusivity, …) | error |
+| control value PEST cannot read: not an integer or a number where one is expected (Fortran `1d-3` is fine), a word outside its field's vocabulary (`precis`, `dpoint`, `obsreref`, …), `absparmax(n)=` malformed or n outside 1-10; the PEST_HP limits and combinations (`RUN_SLOW_FAC`, `RUN_ABANDON_FAC`, `HARDSTOPHOURS` / `SOFTSTOPHOURS` not both, `JCOZEROTHRESH` above `JCOWARNTHRESH`, `ZEROSENVAL`, `REG2MEASRAT` below 1, `orr_not_first` only with `obsreref`) | error |
+| control-data token not in PEST 17.2's pestchek — kept as written, with the closest known name (`"win_mrun_hour=2" … did you mean "win_mrun_hours"?`) | warning |
 | pestchek's warnings: derivative increment larger than a third of the range; initial value 0 with a relative increment; group with only fixed/tied parameters; log parameters with a non-relative increment; observation group listed but empty (dropped on write); `MAXSING` above the adjustable-parameter count; more than 300 adjustable parameters with `ICOV`/`ICOR`/`IEIG` on; `NOPTMAX 0` | warning |
 | PEST_HP-only control variables present (`WIN_MRUN_HOURS`, `UPTESTMIN`, `RRFSAVE`, …; plain PEST needs `/hpstart`); observation group whose weights are all zero | note |
 | template: parameter space narrower than 3 characters or containing a tab | error |
@@ -605,6 +608,22 @@ too, without refusing to write: plain PEST ignores `++` lines, and a newer PEST+
 option this list does not. PEST++ itself stops on an option it does not accept, so fix or remove
 what is flagged before a run.
 
+`validate` prints the two releases its rules were read from, and every manifest records them
+(`checked_against`). Whether they are still current is checked by `tools/rule_sources.py`, which
+re-reads the upstream source and compares it with the snapshot the rules were written against
+(`tools/snapshots/`), exiting 1 on any change:
+
+```
+python tools/rule_sources.py pestpp                        # usgs/pestpp develop, from GitHub
+python tools/rule_sources.py pestchek --source pest_source  # the source folder of a PEST download
+```
+
+It reports added and removed `++` options, aliases, value types and choices; for PEST, the
+control-data keywords pestchek reads and its messages (each message is a rule); and anything
+makePst's own tables no longer agree with. It edits nothing: port what changed, then run it
+again with `--write` to record the new source as reviewed, and the tests hold the code to that
+snapshot. The PEST++ check runs weekly on GitHub and opens an issue when the parser changes.
+
 The `--outputs` interpreter follows the PEST manual (primary and secondary markers, `l`, `w`,
 `t`, `!name!`, `[name]c1:c2`, `(name)c1:c2`, `dum`, `&` continuation) and catches the classic
 mistakes — a `w` too few so a label is read instead of a number, a marker that never appears
@@ -623,12 +642,13 @@ from?" after the fact:
 
 ```json
 {
-  "makepst": "0.4.0",
+  "makepst": "0.5.0",
   "command": "build",
   "argv": ["build", "tr13.pst", "regul", "--set_ctl_xls", "tr13.xlsx,CONTROL", "..."],
   "created": "2026-09-19T13:51:39-04:00",
   "user": "hydro", "host": "OU13700", "cwd": "D:\\...\\0023-makePst",
   "python": "3.12.12", "pandas": "3.0.5", "platform": "Windows-11-10.0.26200-SP0",
+  "checked_against": {"pestchek": "17.2", "pestpp": "5.2.29"},
   "sources": [
     {"path": "D:\\...\\tr13.xlsx", "sha256": "9d641a2f...", "size": 3089317,
      "modified": "2026-07-12T03:32:10-04:00", "role": "control",
@@ -738,6 +758,7 @@ makepst/
   starter.py        the `init` workbook: control-variable descriptions, example rows, drop-downs
 examples/minimal/   the tutorial inputs
 tests/              suite + fixture generator
+tools/              rule_sources.py (are the rules current with PEST / PEST++?) and its snapshots
 ```
 
 ## Releasing
@@ -747,7 +768,7 @@ stored anywhere. To release: bump the version in `pyproject.toml` and the fallba
 `makepst/__init__.py` (a test keeps them equal), add a `CHANGELOG.md` entry, commit, then
 
 ```
-git tag v0.4.0 && git push origin main v0.4.0
+git tag v0.5.0 && git push origin main v0.5.0
 ```
 
 The `publish` workflow checks that the tag matches the package version, runs the tests, builds

{makepst-0.4.0 → makepst-0.5.0}/README.md

@@ -455,8 +455,8 @@ the workbook?" even after the file was renamed or overwritten. `--check` adds a
 `provenance`: `unchanged` / `changed` / `missing`.
 
 ```
-2026-09-19 21:14 build      pest/tr13.pst <- tr13.xlsx  [1068 par 41747 obs 159 prior]  makepst 0.4.0
-2026-09-21 08:10 update     tr13-xlwings.xlsx <- tr13.xlsx, tr13.par  [1068 rows in 8 sheets]  makepst 0.4.0
+2026-09-19 21:14 build      pest/tr13.pst <- tr13.xlsx  [1068 par 41747 obs 159 prior]  makepst 0.5.0
+2026-09-21 08:10 update     tr13-xlwings.xlsx <- tr13.xlsx, tr13.par  [1068 rows in 8 sheets]  makepst 0.5.0
 ```
 
 ### bundle — a run, zipped for review
@@ -532,7 +532,8 @@ explicitly before writing.
 | parameter group defined but unused | fix available: remove the group |
 | prior equation referencing a fixed, tied or missing parameter | error and fix available: rebuild prior information, dropping those equations |
 | adjustable `PARVAL1` outside `[PARLBND, PARUBND]` | warning |
-| control value that is computed (`npar` …) or unknown | ignored (warning) |
+| control value that is computed (`npar` …) | ignored (warning) |
+| control variable makePst does not know (a newer PEST_HP keyword): kept on the line it came from; a CONTROL-sheet row gives that line in `LINE` (`control data line 4`) or is ignored | warning |
 
 `makepst validate` uses the same table checks and adds the **pestchek-style report**: it
 changes nothing, looks beyond the tables at the files the control file points to, and exits 1
@@ -551,7 +552,9 @@ makepst validate tr13.xlsx            # a workbook with a BUILD sheet is built f
 | malformed prior equation; non-numeric right-hand side; `log()` used on a non-log parameter or vice versa | error |
 | `DERCOM` beyond the number of model command lines | error |
 | name longer than PEST's limit (12 parameter / 20 observation / 12 group; PEST++ allows 200) | warning |
-| **pestchek's rules** (from PEST 17's `pestchek.F` / `cheksub.F`): `PARCHGLIM` vocabulary and `absolute(n)` needing `absparmax(n)=`; log parameters factor-limited with positive values; factor-limited bounds of one sign and non-zero; `SCALE ≠ 0`; tied to itself, tied or parent with initial value 0; group `none` reserved; all parameters fixed/tied; `INCTYP` / `FORCEN` / `DERMTHD` vocabularies and their compatibility; split-column ranges; duplicate groups; `dum` as an observation name; prior weights, labels (≤ 20, not an observation name), duplicated parameters, all-zero factors, group `predict`; regularisation needs a `regul*` group, prediction exactly one `predict` observation; ~60 control-variable range and consistency rules (`RLAMFAC`, `PHIRATSUF`, `FACPARMAX`, `NPHISTP`, `RELPARSTP < RELPARMAX`, `EIGTHRESH`, `PHIMLIM < PHIMACCEPT < 1.2·PHIMLIM`, `WFMIN ≤ WFINIT ≤ WFMAX`, `UPTESTMIN`/`UPTESTLIM`, SVD vs AUI vs LSQR exclusivity, …) | error |
+| **pestchek's rules** (from PEST 17.2's `pestchek.F` / `cheksub.F`): `PARCHGLIM` vocabulary and `absolute(n)` needing `absparmax(n)=`; log parameters factor-limited with positive values; factor-limited bounds of one sign and non-zero; `SCALE ≠ 0`; tied to itself, tied or parent with initial value 0; group `none` reserved; all parameters fixed/tied; `INCTYP` / `FORCEN` / `DERMTHD` vocabularies and their compatibility; split-column ranges; duplicate groups; `dum` as an observation name; prior weights, labels (≤ 20, not an observation name), duplicated parameters, all-zero factors, group `predict`; regularisation needs a `regul*` group, prediction exactly one `predict` observation; ~60 control-variable range and consistency rules (`RLAMFAC`, `PHIRATSUF`, `FACPARMAX`, `NPHISTP`, `RELPARSTP < RELPARMAX`, `EIGTHRESH`, `PHIMLIM < PHIMACCEPT < 1.2·PHIMLIM`, `WFMIN ≤ WFINIT ≤ WFMAX`, `UPTESTMIN`/`UPTESTLIM`, SVD vs AUI vs LSQR exclusivity, …) | error |
+| control value PEST cannot read: not an integer or a number where one is expected (Fortran `1d-3` is fine), a word outside its field's vocabulary (`precis`, `dpoint`, `obsreref`, …), `absparmax(n)=` malformed or n outside 1-10; the PEST_HP limits and combinations (`RUN_SLOW_FAC`, `RUN_ABANDON_FAC`, `HARDSTOPHOURS` / `SOFTSTOPHOURS` not both, `JCOZEROTHRESH` above `JCOWARNTHRESH`, `ZEROSENVAL`, `REG2MEASRAT` below 1, `orr_not_first` only with `obsreref`) | error |
+| control-data token not in PEST 17.2's pestchek — kept as written, with the closest known name (`"win_mrun_hour=2" … did you mean "win_mrun_hours"?`) | warning |
 | pestchek's warnings: derivative increment larger than a third of the range; initial value 0 with a relative increment; group with only fixed/tied parameters; log parameters with a non-relative increment; observation group listed but empty (dropped on write); `MAXSING` above the adjustable-parameter count; more than 300 adjustable parameters with `ICOV`/`ICOR`/`IEIG` on; `NOPTMAX 0` | warning |
 | PEST_HP-only control variables present (`WIN_MRUN_HOURS`, `UPTESTMIN`, `RRFSAVE`, …; plain PEST needs `/hpstart`); observation group whose weights are all zero | note |
 | template: parameter space narrower than 3 characters or containing a tab | error |
@@ -574,6 +577,22 @@ too, without refusing to write: plain PEST ignores `++` lines, and a newer PEST+
 option this list does not. PEST++ itself stops on an option it does not accept, so fix or remove
 what is flagged before a run.
 
+`validate` prints the two releases its rules were read from, and every manifest records them
+(`checked_against`). Whether they are still current is checked by `tools/rule_sources.py`, which
+re-reads the upstream source and compares it with the snapshot the rules were written against
+(`tools/snapshots/`), exiting 1 on any change:
+
+```
+python tools/rule_sources.py pestpp                        # usgs/pestpp develop, from GitHub
+python tools/rule_sources.py pestchek --source pest_source  # the source folder of a PEST download
+```
+
+It reports added and removed `++` options, aliases, value types and choices; for PEST, the
+control-data keywords pestchek reads and its messages (each message is a rule); and anything
+makePst's own tables no longer agree with. It edits nothing: port what changed, then run it
+again with `--write` to record the new source as reviewed, and the tests hold the code to that
+snapshot. The PEST++ check runs weekly on GitHub and opens an issue when the parser changes.
+
 The `--outputs` interpreter follows the PEST manual (primary and secondary markers, `l`, `w`,
 `t`, `!name!`, `[name]c1:c2`, `(name)c1:c2`, `dum`, `&` continuation) and catches the classic
 mistakes — a `w` too few so a label is read instead of a number, a marker that never appears
@@ -592,12 +611,13 @@ from?" after the fact:
 
 ```json
 {
-  "makepst": "0.4.0",
+  "makepst": "0.5.0",
   "command": "build",
   "argv": ["build", "tr13.pst", "regul", "--set_ctl_xls", "tr13.xlsx,CONTROL", "..."],
   "created": "2026-09-19T13:51:39-04:00",
   "user": "hydro", "host": "OU13700", "cwd": "D:\\...\\0023-makePst",
   "python": "3.12.12", "pandas": "3.0.5", "platform": "Windows-11-10.0.26200-SP0",
+  "checked_against": {"pestchek": "17.2", "pestpp": "5.2.29"},
   "sources": [
     {"path": "D:\\...\\tr13.xlsx", "sha256": "9d641a2f...", "size": 3089317,
      "modified": "2026-07-12T03:32:10-04:00", "role": "control",
@@ -707,6 +727,7 @@ makepst/
   starter.py        the `init` workbook: control-variable descriptions, example rows, drop-downs
 examples/minimal/   the tutorial inputs
 tests/              suite + fixture generator
+tools/              rule_sources.py (are the rules current with PEST / PEST++?) and its snapshots
 ```
 
 ## Releasing
@@ -716,7 +737,7 @@ stored anywhere. To release: bump the version in `pyproject.toml` and the fallba
 `makepst/__init__.py` (a test keeps them equal), add a `CHANGELOG.md` entry, commit, then
 
 ```
-git tag v0.4.0 && git push origin main v0.4.0
+git tag v0.5.0 && git push origin main v0.5.0
 ```
 
 The `publish` workflow checks that the tag matches the package version, runs the tests, builds

{makepst-0.4.0 → makepst-0.5.0}/makepst/__init__.py

@@ -3,7 +3,7 @@ try:                                        # the installed package's metadata (
     from importlib.metadata import version as _dist_version
     __version__ = _dist_version('makepst')
 except Exception:                           # a checkout run without installing
-    __version__ = '0.4.0'
+    __version__ = '0.5.0'
 
 from .excel import load_table, to_workbook, update_workbook
 from .hpstart import write_hpstart

{makepst-0.4.0 → makepst-0.5.0}/makepst/cli.py

@@ -49,6 +49,8 @@ def _build_parser(p):
     p.add_argument('--no_dump_tpl', action='store_true', help="don't write dump.tpl next to the pst")
     p.add_argument('--no_manifest', action='store_true', help="don't write <pst>.manifest.json")
     p.add_argument('--out', metavar='PST', help='with a workbook: where to write (default: the name in the BUILD sheet)')
+    p.add_argument('--dry_run', action='store_true',
+                   help="report as `makepst validate` would on the control file this builds; write nothing")
     fmt_ = p.add_mutually_exclusive_group()
     fmt_.add_argument('--v2', action='store_true', help='write a PEST++ version-2 file (external csv tables beside it)')
     fmt_.add_argument('--v1', action='store_true', help='write the classic format (default for tables)')
@@ -111,15 +113,19 @@ def _finish_pst(pst, path, manifest, dump_tpl, version=None, eol=None):
 
 
 def build(args):
-    manifest = None if args.no_manifest else Manifest('build', args._argv)
+    manifest = None if args.no_manifest or args.dry_run else Manifest('build', args._argv)
     if args.pstfile.lower().endswith(WORKBOOK_EXT):
         # `makepst build book.xlsx [--out x.pst]`: run the command in the workbook's BUILD sheet
         pst, ns = build_from_workbook(args.pstfile, manifest)
+        if args.dry_run:
+            return check_report(pst, args.pstfile, built=True, dry_run=True)
         out = args.out or os.path.join(os.path.dirname(os.path.abspath(args.pstfile)), ns.pstfile)
         _finish_pst(pst, out, manifest, dump_tpl=not (args.no_dump_tpl or ns.no_dump_tpl),
                     version=_version(args) or _version(ns))
         return
     pst = build_pst(args, manifest)
+    if args.dry_run:
+        return check_report(pst, args.pstfile, built=True, dry_run=True)
     _finish_pst(pst, args.pstfile, manifest, dump_tpl=not args.no_dump_tpl, version=_version(args))
 
 
@@ -130,8 +136,10 @@ def build_from_workbook(book, manifest=None):
     try:
         rows = pd.read_excel(book, 'BUILD', engine='openpyxl').iloc[:, 0].dropna()
     except ValueError:
-        raise SystemExit(f'{book} has no BUILD sheet; add one holding the build command '
-                         f'(as `makepst dump` does), or use `makepst build ... --fill_parval`') from None
+        raise SystemExit(f'{book} has no BUILD sheet; add one holding the build command (as `makepst dump` '
+                         f'does), or name the tables on the command line: `makepst build OUT.pst --set_ctl_xls '
+                         f'"{os.path.basename(book)},CONTROL" --add_par_xls ...`, with --dry_run to check them '
+                         f'without writing') from None
     argv = [a.strip('"') for a in shlex.split(' '.join(str(r) for r in rows), posix=False)]
     while argv and (argv[0].lower() in ('python', 'makepst', 'build') or argv[0].lower().endswith('makepst.py')):
         argv.pop(0)
@@ -403,27 +411,46 @@ def guess_base_dir(pst, target):
 
 def validate(args):
     """pestchek-style report for a control file or a workbook (built via its BUILD sheet)."""
-    from .checks import Finding, summary, validate as run_checks
     target = args.target
     if target.lower().endswith(WORKBOOK_EXT):
-        pst, _ = build_from_workbook(target)
-        pst_path = None
+        check_report(build_from_workbook(target)[0], target, built=True, base_dir=args.base_dir,
+                     outputs=args.outputs, quiet=args.quiet, strict=args.strict)
+    else:
+        check_report(read_pst(target), target, pst_path=target, base_dir=args.base_dir,
+                     outputs=args.outputs, quiet=args.quiet, strict=args.strict)
+
+
+def check_report(pst, target, built=False, pst_path=None, base_dir=None, outputs=False, quiet=False,
+                 strict=False, dry_run=False):
+    """Print the validate report for `pst`; exit 1 on errors (or warnings with `strict`).
+
+    `built`: the Pst comes from tables, not from a control file. It is then judged as `build` would write it,
+    after the same normalization (regularisation equations from PRIOR/WEIGHT, unused groups removed, ...);
+    judging the tables before it would report errors that building removes. The fixes are listed as notes.
+    """
+    from .checks import Finding, summary, validate as run_checks
+    from .provenance import checked_against
+    fixes = pst.validate().fixes_available
+    if built:
+        pst.normalize()
+        notes = [Finding('info', 'normalization', f'{fix} (done by build)') for fix in fixes]
     else:
-        pst = read_pst(target)
-        pst_path = target
-    base = args.base_dir or guess_base_dir(pst, target)
-    findings = run_checks(pst, base_dir=base, pst_path=pst_path, outputs=args.outputs)
-    findings += [Finding('info', 'normalization', str(fix)) for fix in pst.validate().fixes_available]
-    if not args.base_dir and not args.quiet:
+        notes = [Finding('info', 'normalization', str(fix)) for fix in fixes]
+    base = base_dir or guess_base_dir(pst, target)
+    findings = run_checks(pst, base_dir=base, pst_path=pst_path, outputs=outputs) + notes
+    if not base_dir and not quiet:
         print(f'INFO    file paths resolved relative to {base} (override with --base_dir)')
+    if not quiet:
+        v = checked_against()
+        print(f"INFO    rules from PEST {v['pestchek']}'s pestchek and PEST++ {v['pestpp']}'s options")
     order = {'error': 0, 'warning': 1, 'info': 2}
     for f in sorted(findings, key=lambda f: order[f.severity]):
-        if f.severity == 'info' and args.quiet:
+        if f.severity == 'info' and quiet:
             continue
         print(f)
     n, text = summary(findings)
-    print(f'{target}: {text}')
-    if n['error'] or (args.strict and n['warning']):
+    print(f'{target}: {text}' + (' (dry run: nothing written)' if dry_run else ''))
+    if n['error'] or (strict and n['warning']):
         raise SystemExit(1)
 
 

{makepst-0.4.0 → makepst-0.5.0}/makepst/excel.py

@@ -86,6 +86,9 @@ def control_table(pst: Pst):
                 val = pst.control.get(k)
             default = pst.counts.get(k, sec.defaults.get(k))
             rows.append((sec.name, k, default, val))
+    # tokens this makePst does not know, kept with the line PEST reads them on so build puts them back there
+    for k, (section, n) in getattr(pst, 'control_line', {}).items():
+        rows.append((f'{section} line {n}', k, None, pst.control.get(k)))
     return pd.DataFrame(rows, columns=['LINE', 'NAME', 'DEFAULT', 'VALUE'])
 
 

{makepst-0.4.0 → makepst-0.5.0}/makepst/pestpp.py

@@ -1,6 +1,6 @@
 """PEST++ `++` options: what PEST++ accepts, and a check of a control file's options against it.
 
-The registry is read off PEST++ 5.2.29 (usgs/pestpp develop, commit ad8428d, 2026-07-09), from
+The registry is read off PEST++ 5.2.29 (usgs/pestpp develop, commit 02e1455, 2026-09-03), from
 PestppOptions::assign_value_by_key and the ies / da / mou / sqp functions it falls through to in
 src/libs/pestpp_common/pest_data_structs.cpp. What that code does on start-up decides the severities:
 
@@ -14,6 +14,9 @@ src/libs/pestpp_common/pest_data_structs.cpp. What that code does on start-up de
 
 `++` lines go to PestppOptions only. Control variables (noptmax, maxsing, ...) are accepted in a
 version-2 file's `* control data keyword` section, not as `++` options.
+
+`python tools/rule_sources.py pestpp` re-reads that source and reports what has changed since, and whether
+the names, aliases, types and choices below still match what was extracted (tools/snapshots/pestpp.json).
 """
 import difflib
 import re

{makepst-0.4.0 → makepst-0.5.0}/makepst/provenance.py

@@ -31,6 +31,14 @@ def _file_record(path):
     }
 
 
+def checked_against():
+    """The releases makePst's checks were read from: PEST's pestchek (control data, PEST_HP variables) and
+    PEST++'s option list. A check is only as current as these; the manifest records them with each output."""
+    from .pestpp import PESTPP_REGISTRY_VERSION
+    from .sections import PESTCHEK_SOURCE_VERSION
+    return {'pestchek': PESTCHEK_SOURCE_VERSION, 'pestpp': PESTPP_REGISTRY_VERSION}
+
+
 class Manifest:
     def __init__(self, command, argv=None):
         from . import __version__
@@ -47,6 +55,7 @@ class Manifest:
             'python': platform.python_version(),
             'pandas': pandas.__version__,
             'openpyxl': openpyxl.__version__,
+            'checked_against': checked_against(),
             'platform': platform.platform(),
             'sources': [],
             'output': None,

{makepst-0.4.0 → makepst-0.5.0}/makepst/pst.py

@@ -13,7 +13,7 @@ from dataclasses import dataclass, field
 import numpy as np
 import pandas as pd
 
-from .sections import COMPUTED, FIELD_SECTION, _num, fmt, is_number, normalize_mode
+from .sections import COMPUTED, FIELD_SECTION, SECTIONS, _num, fmt, is_number, normalize_mode
 
 PAR_COLS = 'PARNME PARTRANS PARCHGLIM PARVAL1 PARLBND PARUBND PARGP SCALE OFFSET DERCOM'.split()
 PAR_EXTRA = ['TIETO', 'PRIOR', 'WEIGHT']          # optional columns carried on self.par
@@ -31,6 +31,14 @@ def _clean(s):
     return s.astype(str).str.strip().str.lower()
 
 
+def _control_place(text):
+    """('control data', 4) from a CONTROL sheet's LINE cell such as 'control data line 4', else None."""
+    m = re.fullmatch(r'\*?\s*(.*?)[\s,]+(?:line\s*)?(\d+)', str(text or '').strip().lower())
+    if m and m.group(1) in SECTIONS and int(m.group(2)) > 0:
+        return SECTIONS[m.group(1)].name, int(m.group(2))
+    return None
+
+
 def _is_storage(names):
     return names.str.startswith('ss') | names.str.startswith('sy')
 
@@ -185,6 +193,7 @@ class Pst:
         self.ss = ss                    # steady state: drop storage (ss*/sy*) parameters and groups
         self.comments = []              # '# ...' lines written after 'pcf'
         self.control = {}               # user values for every control-style section, flat
+        self.control_line = {}          # control tokens the schema does not know: name -> (section, line number)
         self.use_svd = True
         self.par = _empty(PAR_COLS)
         self.pargp = _empty(PARGP_COLS)
@@ -246,11 +255,16 @@ class Pst:
     # ------------------------------------------------------------------ control
     def set_control(self, values):
         """Set control-style values from a dict or a CONTROL sheet (NAME/VALUE columns)."""
+        lines = {}
         if isinstance(values, pd.DataFrame):
             df = values.iloc[:, :4].copy()
             df.columns = ['LINE', 'NAME', 'DEFAULT', 'VALUE'][:df.shape[1]]
-            values = {str(r.NAME).strip().lower(): r.VALUE
-                      for r in df.dropna(subset=['NAME', 'VALUE']).itertuples()}
+            rows = df.dropna(subset=['NAME', 'VALUE']).itertuples()
+            values = {}
+            for r in rows:
+                name = str(r.NAME).strip().lower()
+                values[name] = r.VALUE
+                lines[name] = getattr(r, 'LINE', None)
         for k, v in values.items():
             k = str(k).strip().lower()
             if k == 'pestmode':
@@ -258,7 +272,16 @@ class Pst:
             elif k in COMPUTED:
                 warnings.warn(f'control value {k}={v!r} ignored; it is computed from the tables')
             elif k not in FIELD_SECTION:
-                warnings.warn(f'unknown control variable {k!r} ignored')
+                # A token this makePst does not know (a newer PEST_HP variable, say) is kept, like an unknown
+                # `++` option - but PEST reads it only on its own line, so it needs one: a control file gives
+                # it, a CONTROL sheet says it in the LINE column ('control data line 4').
+                place = _control_place(lines.get(k)) or self.control_line.get(k)
+                if place is None:
+                    warnings.warn(f'unknown control variable {k!r} ignored: give the line it belongs on, '
+                                  f"as 'control data line 4' in the CONTROL sheet's LINE column")
+                elif fmt(v) != '':
+                    self.control[k] = _num(v) if isinstance(v, str) else v
+                    self.control_line[k] = place
             elif fmt(v) != '':
                 self.control[k] = _num(v) if isinstance(v, str) else v   # csv gives strings
 
@@ -632,8 +655,8 @@ class Pst:
                     'tied_to_fixed', 'Convert parameters tied to fixed parameters to fixed', fixed))
 
         prior_rows = []
+        adjustable = set(self.par.loc[self.par['PARTRANS'].isin(ADJUSTABLE), 'PARNME'])
         if self.nprior:
-            adjustable = set(self.par.loc[self.par['PARTRANS'].isin(ADJUSTABLE), 'PARNME'])
             for row in self.prior.itertuples():
                 refs = equation_params(str(row.EQ))
                 if any(name not in adjustable for name in refs):
@@ -644,6 +667,17 @@ class Pst:
                 warnings.simplefilter('always')
                 expected = self._auto_prior()
             report.warnings.extend(Finding('warning', 'prior information', str(w.message)) for w in caught)
+            # _build_prior drops a PRIOR that names a fixed, tied or missing parameter, so
+            # compare against what it would keep, or normalize() could never satisfy this check
+            buildable = expected['EQ'].map(
+                lambda eq: all(p in adjustable for p in equation_params(eq))).astype(bool)
+            if (~buildable).any():
+                skipped = expected.loc[~buildable, 'PINME'].tolist()
+                report.warnings.append(Finding(
+                    'warning', 'prior information',
+                    f'{len(skipped)} PRIOR entries name a fixed, tied or missing parameter and '
+                    f'get no equation: {skipped[:5]}'))
+            expected = expected[buildable]
             current = self.prior[self.prior['PINME'].isin(self._auto_labels)]
             manual = self.prior[~self.prior['PINME'].isin(self._auto_labels)]
             collisions = tuple(sorted(set(expected['PINME']) & set(manual['PINME'])))

{makepst-0.4.0 → makepst-0.5.0}/makepst/reader.py

@@ -161,11 +161,19 @@ def from_text(text, base_dir='.'):
     counts = {k: ctl.get(k) for k in COMPUTED}
     pst.use_svd = 'singular value decomposition' in sections or any(
         k in ctl for k in ('svdmode', 'maxsing', 'eigthresh'))
+    extras = [(CONTROL.name, ctl.pop('_extra', {}))]
     for name in list(sections):
         sec = SECTIONS.get(name)
         if sec is not None:
-            ctl.update(sec.parse(sections.pop(name)))
+            values = sec.parse(sections.pop(name))
+            extras.append((sec.name, values.pop('_extra', {})))
+            ctl.update(values)
     pst.control = {k: v for k, v in ctl.items() if k not in COMPUTED and not k.startswith('_')}
+    for section, lines in extras:
+        for n, tokens in lines.items():
+            for key, value in tokens:
+                pst.control[key] = value
+                pst.control_line[key] = (section, n)
 
     def take(section):
         """Body of a classic section, or the table of its external variant (None if absent)."""