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

Remove redundant self._next_triggers construction and add AndTrigger test. #914

Merged

Conversation

bmeares
Copy link
Contributor

@bmeares bmeares commented May 14, 2024

Changes

Fixes #911.

When combining triggers (IntervalTrigger, CronTrigger, CalendarIntervalTrigger) with the AndTrigger, this patch ensures the expected datetimes are fired. The now-fixed bug was that every other interval was skipped in certain scenarios, such as when using IntervalTrigger with days.

Checklist

If this is a user-facing code change, like a bugfix or a new feature, please ensure that
you've fulfilled the following conditions (where applicable):

  • You've added tests (in tests/) added which would fail without your patch
  • You've updated the documentation (in docs/, in case of behavior changes or new
    features)
  • You've added a new changelog entry (in docs/versionhistory.rst).

If this is a trivial change, like a typo fix or a code reformatting, then you can ignore
these instructions.

Updating the changelog

If there are no entries after the last release, use **UNRELEASED** as the version.
If, say, your patch fixes issue #999, the entry should look like this:

* Fix big bad boo-boo in the async scheduler (#999 <https://github.com/agronholm/apscheduler/issues/999>_; PR by Yourname)

If there's no issue linked, just link to your pull request instead by updating the
changelog after you've created the PR.

If possible, use your real name in the changelog entry. If not, use your GitHub
username.

docs/versionhistory.rst Outdated Show resolved Hide resolved
Copy link
Owner

@agronholm agronholm left a comment

Choose a reason for hiding this comment

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

Nice catch with the redundant line. I just have some comments on the tests.

tests/triggers/test_combining.py Outdated Show resolved Hide resolved
tests/triggers/test_combining.py Outdated Show resolved Hide resolved
tests/triggers/test_combining.py Outdated Show resolved Hide resolved
@agronholm
Copy link
Owner

Would you mind removing the rest of the redundant zeroes from the datetime() calls? Then I'm ready to merge this.

@bmeares
Copy link
Contributor Author

bmeares commented May 15, 2024

All cleaned up, ready to merge👍🏻

@agronholm agronholm merged commit 4c3effd into agronholm:master May 15, 2024
10 of 12 checks passed
@agronholm
Copy link
Owner

Thanks!

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.

[v4.0.0a4] Combining daily and weekly triggers increments by 14 days
2 participants