Skip to content

fix: rerun-trigger regression#3492

Merged
johanneskoester merged 1 commit into
snakemake:mainfrom
cademirch:fix-shell-rerun-regression
Apr 1, 2025
Merged

fix: rerun-trigger regression#3492
johanneskoester merged 1 commit into
snakemake:mainfrom
cademirch:fix-shell-rerun-regression

Conversation

@cademirch

@cademirch cademirch commented Mar 28, 2025

Copy link
Copy Markdown
Contributor

fixes #3491

Edit: This is reverting 4430e23, which changed the default for rerun-trigger for the docs. Presumably because RerunTrigger.all() gives the actual enum values which don't render nicely.

Will need to find a better solution. Any thoughts @fgvieira?

QC

  • The PR contains a test case for the changes or the changes are already covered by an existing test case.
  • The documentation (docs/) is updated to reflect the changes or this is not necessary (e.g. if the change does neither modify the language nor the behavior or functionalities of Snakemake).

Summary by CodeRabbit

  • New Features
    • Updated the CLI default so that all available triggers for job reruns are enabled by default, ensuring a more comprehensive and consistent behavior that aligns with workflow configurations.

@coderabbitai

coderabbitai Bot commented Mar 28, 2025

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

The change updates the default value for the --rerun-triggers argument in the get_argument_parser function of the CLI. Previously, it used RerunTrigger.choices(), and now it has been changed to RerunTrigger.all(), ensuring that all available rerun triggers are enabled by default. The help text remains unchanged, and no modifications were made to the exported or public entities.

Changes

File Change Summary
src/snakemake/cli.py Modified default value for --rerun-triggers argument in get_argument_parser: changed from RerunTrigger.choices() to RerunTrigger.all().

Assessment against linked issues

Objective Addressed Explanation
Ensure that changes to shell directive content trigger a rerun (#3491)

Possibly related PRs

Suggested reviewers

  • johanneskoester

Warning

Review ran into problems

🔥 Problems

Git: Failed to clone repository. Please run the @coderabbitai full review command to re-trigger a full review. If the issue persists, set path_filters to include or exclude specific files.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai plan to trigger planning for file edits and PR creation.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
src/snakemake/cli.py (1)

724-724: Approving the fix for rerun-trigger default value

This change restores the correct default value for the --rerun-triggers argument, ensuring that all available rerun triggers are enabled by default. This aligns with the help text description at line 726 which states "By default, all triggers are used..."

The change fixes the regression mentioned in PR title by replacing RerunTrigger.choices() with RerunTrigger.all().

Consider adding a unit test that verifies the default value of --rerun-triggers to prevent similar regressions in the future.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 17f0d9b and 01026e1.

📒 Files selected for processing (1)
  • src/snakemake/cli.py (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
`**/*.py`: Do not try to improve formatting. Do not suggest type annotations for functions that are defined inside of functions or methods. Do not suggest type annotation of the `s...

**/*.py: Do not try to improve formatting.
Do not suggest type annotations for functions that are defined inside of functions or methods.
Do not suggest type annotation of the self argument of methods.
Do not suggest type annotation of the cls argument of classmethods.
Do not suggest return type annotation if a function or method does not contain a return statement.

  • src/snakemake/cli.py
⏰ Context from checks skipped due to timeout of 90000ms (36)
  • GitHub Check: tests (10, windows-latest, py312)
  • GitHub Check: tests (10, ubuntu-latest, py312)
  • GitHub Check: tests (10, ubuntu-latest, py311)
  • GitHub Check: tests (9, windows-latest, py312)
  • GitHub Check: tests (9, ubuntu-latest, py312)
  • GitHub Check: tests (9, ubuntu-latest, py311)
  • GitHub Check: tests (8, windows-latest, py312)
  • GitHub Check: tests (8, ubuntu-latest, py312)
  • GitHub Check: tests (8, ubuntu-latest, py311)
  • GitHub Check: tests (7, windows-latest, py312)
  • GitHub Check: tests (7, ubuntu-latest, py312)
  • GitHub Check: tests (7, ubuntu-latest, py311)
  • GitHub Check: tests (6, windows-latest, py312)
  • GitHub Check: tests (6, ubuntu-latest, py312)
  • GitHub Check: tests (6, ubuntu-latest, py311)
  • GitHub Check: tests (5, windows-latest, py312)
  • GitHub Check: tests (5, ubuntu-latest, py312)
  • GitHub Check: tests (5, ubuntu-latest, py311)
  • GitHub Check: tests (4, macos-latest, py312)
  • GitHub Check: tests (4, windows-latest, py312)
  • GitHub Check: tests (4, ubuntu-latest, py312)
  • GitHub Check: tests (4, ubuntu-latest, py311)
  • GitHub Check: tests (3, macos-latest, py312)
  • GitHub Check: tests (3, windows-latest, py312)
  • GitHub Check: tests (3, ubuntu-latest, py312)
  • GitHub Check: tests (3, ubuntu-latest, py311)
  • GitHub Check: tests (2, macos-latest, py312)
  • GitHub Check: tests (2, windows-latest, py312)
  • GitHub Check: tests (2, ubuntu-latest, py312)
  • GitHub Check: tests (2, ubuntu-latest, py311)
  • GitHub Check: tests (1, macos-latest, py312)
  • GitHub Check: tests (1, windows-latest, py312)
  • GitHub Check: tests (1, ubuntu-latest, py312)
  • GitHub Check: tests (1, ubuntu-latest, py311)
  • GitHub Check: apidocs
  • GitHub Check: formatting

@fgvieira

Copy link
Copy Markdown
Contributor

But why doesn't RerunTrigger.choices() trigger the re-runs? It should be the same as RerunTrigger.all(), no?

@cademirch

Copy link
Copy Markdown
Contributor Author

But why doesn't RerunTrigger.choices() trigger the re-runs? It should be the same as RerunTrigger.all(), no?

.choices() returns list[str] whereas .all() returns list[RerunTrigger].

See this comment #3491 (comment)

@fgvieira

fgvieira commented Mar 30, 2025

Copy link
Copy Markdown
Contributor

But that is a string when set by the user, so a list[str] should also work as choices, no? Unless it is parsed by

parse_func=RerunTrigger.parse_choices_set,

and the defaults are not...

As for the docs, what I discussed with @johanneskoester at the time, was that the proper way would actually by to fix the parsing of the options by sphinx-argparse.

@cademirch

cademirch commented Mar 30, 2025 via email

Copy link
Copy Markdown
Contributor Author

@johanneskoester

Copy link
Copy Markdown
Contributor

Merging this for now to avoid the regression

@johanneskoester johanneskoester merged commit 811742d into snakemake:main Apr 1, 2025
johanneskoester pushed a commit that referenced this pull request Apr 1, 2025
🤖 I have created a release *beep* *boop*
---


##
[9.1.4](v9.1.3...v9.1.4)
(2025-04-01)


### Bug Fixes

* Fix map call in report creation
([#3503](#3503))
([44754cc](44754cc))
* in the report, do not render toggle labels if there is more than one
label eligible for a toggle
([#3502](#3502))
([3be8ca9](3be8ca9))
* only inform about storage cleanup in case of --verbose mode
([#3494](#3494))
([62bbbf5](62bbbf5))
* provide causing rule to workflow error during checkpoint handling
([#3499](#3499))
([b4cbe5d](b4cbe5d))
* rerun-trigger regression
([#3492](#3492))
([811742d](811742d))


### Documentation

* note about parameter inheritance when using the "use rule with"
pattern ([#3500](#3500))
([8f6a8eb](8f6a8eb))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
kjohnsen pushed a commit to kjohnsen/snakemake that referenced this pull request Dec 15, 2025
fixes snakemake#3491

Edit: This is reverting 4430e23, which changed the default for
rerun-trigger for the docs. Presumably because `RerunTrigger.all()`
gives the actual enum values which don't render nicely.

Will need to find a better solution. Any thoughts @fgvieira?

<!--Add a description of your PR here-->

### QC
<!-- Make sure that you can tick the boxes below. -->

* [ ] The PR contains a test case for the changes or the changes are
already covered by an existing test case.
* [ ] The documentation (`docs/`) is updated to reflect the changes or
this is not necessary (e.g. if the change does neither modify the
language nor the behavior or functionalities of Snakemake).


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Updated the CLI default so that all available triggers for job reruns
are enabled by default, ensuring a more comprehensive and consistent
behavior that aligns with workflow configurations.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
kjohnsen pushed a commit to kjohnsen/snakemake that referenced this pull request Dec 15, 2025
🤖 I have created a release *beep* *boop*
---


##
[9.1.4](snakemake/snakemake@v9.1.3...v9.1.4)
(2025-04-01)


### Bug Fixes

* Fix map call in report creation
([snakemake#3503](snakemake#3503))
([44754cc](snakemake@44754cc))
* in the report, do not render toggle labels if there is more than one
label eligible for a toggle
([snakemake#3502](snakemake#3502))
([3be8ca9](snakemake@3be8ca9))
* only inform about storage cleanup in case of --verbose mode
([snakemake#3494](snakemake#3494))
([62bbbf5](snakemake@62bbbf5))
* provide causing rule to workflow error during checkpoint handling
([snakemake#3499](snakemake#3499))
([b4cbe5d](snakemake@b4cbe5d))
* rerun-trigger regression
([snakemake#3492](snakemake#3492))
([811742d](snakemake@811742d))


### Documentation

* note about parameter inheritance when using the "use rule with"
pattern ([snakemake#3500](snakemake#3500))
([8f6a8eb](snakemake@8f6a8eb))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Regression in version 9: Changes to "shell" directive content don't trigger rerun anymore

3 participants