Conversation
doc_url fields, parse_settings_custom.toml upload_info links, and webinterface help-text links still pointed at docs/available-modules/, which was deleted when the docs were restructured into docs/modules/dda|dia/*.md. Update every link to the new paths, remapping anchors that no longer resolve (#custom-format is now a collapsible dropdown with no HTML id, so it points at #tool-specific-setup instead). Regenerate module_grid_generated.rst so the homepage grid picks up the corrected doc_url values.
The script still pointed at the deleted docs/available-modules/active-modules/ directory and searched for table markers that no longer exist, so it would have crashed CI the next time a PR touched an io_parse_settings TOML (the check only runs conditionally on that). Point it at docs/modules/, add the AIF and entrapment modules it never covered, and derive entrapment's extra "Parsed FDR column" from each tool's [mapper]. Regenerating surfaced real pre-existing drift independent of this fix: AIF's table was missing a FragPipe row and called MaxQuant "MaxDIA", and entrapment's table was missing its plain FragPipe tool. Also fix the CI workflow's now-dead git diff path for this check.
Brings in main's finished entrapment feature work (custom format support,
modification support, Spectronaut, PEAKS protein-FDR fix, funding logos) on top
of new-docs's documentation restructuring.
Conflict resolution:
- docs/available-modules/{active,archived}-modules/*.md: kept deleted (superseded
by docs/modules/dda|dia/*.md). Ported main's real content changes into the new
pages: a PEAKS sample-naming-correction note (ZenoTOF, diaPASEF, Astral, AIF),
and the entrapment page's beta-stage promotion, updated modification-support
behavior, corrected dataset description, Spectronaut/Custom-format
instructions, and dropped the FragPipe dropdown (not in main's finished tool
registry) in favor of a short "not supported" note.
- webinterface/pages/pages_variables/Entrapment/Entrapment_DIA_ion_Astral_variables.py:
took main's beta_warning=True (a deliberate stage promotion, vs. this
session's earlier alpha_warning=False fix which only addressed the alpha flag).
- docs/module_grid_generated.rst: regenerated from source after resolving the
above, rather than hand-merging the auto-generated content.
- proteobench/io/parsing/io_parse_settings/parse_settings_files.toml: kept
main's entrapment tool list (DIA-NN, AlphaDIA, Custom, Spectronaut) rather
than new-docs's independent FragPipe/FragPipe(DIA-NN quant) additions, per
main being the authoritative finished state for this module. The two FragPipe
TOML configs remain on disk, unregistered.
Also fixed a stale readthedocs link in the (re-added) entrapment Custom format
TOML that main's own history still had, and re-ran generate_input_tables.py so
every module's input-files table reflects the merged registry.
Contributor
|
@copilot resolve the merge conflicts in this pull request |
rodvrees
reviewed
Aug 5, 2026
Contributor
|
Thanks a lot Caro, this looks great.
|
mlocardpaulet
left a comment
Contributor
There was a problem hiding this comment.
I love it.
Just a few things:
- I said it in the comments, and I feel very strongly about it: we must keep the "about" page as was written with everyone in the first ProteoBench meetings. I don't want any time-dilution/drift of the important concepts agreed upon together (and with some intense discussions sometimes ;))
- I like "benchmark module(s)", I saw that you removed the "benchmark" in most places. It is OK... But I would keep "benchmark module" in titles, and for example in the left-hand side menu. Then of course we can have in the drop down "DIA modules" and "DDA modules". It is clearly explained in the glossary too. So I like it.
- I didn't check all modules, but we removed the PXDs of the raw date? I think it would be nice to have it somewhere even if it is not prominent.
- in the documentation of the DIA entrapment, there is a nice visible warning because it is beta. I like it. But I don't see anything in other beta modules, and I don't see an alpha warning banner for the alpha modules.
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
Co-authored-by: Marie Locard-Paulet <8386272+mlocardpaulet@users.noreply.github.com>
SamvPy
approved these changes
Aug 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Might look like a lot, but most of the file changes are just updated paths.