Add Django 4 compatibility #2
Merged
Conversation
This file contains 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
horthbynorthwest
commented
May 8, 2024
| fired at the same time - which may happened when job execution is longer that job interval. | ||
| """ | ||
|
|
||
| @transaction.atomic | ||
| def lock(self): | ||
| lock, created = CronJobLock.objects.get_or_create(job_name=self.job_name) | ||
| lock, created = CronJobLock.objects.select_for_update().get_or_create(job_name=self.job_name) |
There was a problem hiding this comment.
Probably isn't needed for us, but good future proofing, resolves an issue listed here
horthbynorthwest
commented
May 8, 2024
| @@ -1,6 +1,6 @@ | |||
| from django.conf import settings | |||
|
|
|||
| from django_common.helper import send_mail | |||
| from django.core.mail import send_mail | |||
| @@ -13,7 +13,7 @@ jobs: | |||
| strategy: | |||
| max-parallel: 4 | |||
| matrix: | |||
| python-version: [3.8, 3.9, 3.10, 3.11] | |||
| python-version: [3.8, 3.9, '3.10', 3.11] | |||
There was a problem hiding this comment.
Required due to actions/runner#1989
.travis.yml
Outdated
There was a problem hiding this comment.
I believe this file is unused as it uses github/workflows for the test runners.
horthbynorthwest
changed the title
rob-s-s
reviewed
May 13, 2024
| @@ -5,13 +5,13 @@ | |||
|
|
|||
| class DatabaseLock(DjangoCronJobLock): | |||
| """ | |||
| Locking cron jobs with database. Its good when you have not parallel run and want to make sure 2 jobs won't be | |||
| Locking cron jobs with database. It's good when you have not parallel run and want to make sure 2 jobs won't be | |||
There was a problem hiding this comment.
"have not parallel run" doesn't read right? I'm not sure exactly what it means.
Suggested change
| Locking cron jobs with database. It's good when you have not parallel run and want to make sure 2 jobs won't be | |
| Locking cron jobs with database. It's good when you have not run cron jobs in parallel and want to make sure 2 jobs won't be |
aidan-stuart-leary
approved these changes
May 14, 2024
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.
Unlike last time we did this #1 there haven't been many changes made on the base django-cron branch, so there's been nothing to merge in. I've updated the versions and the test matrix to cover django 4 testing, which are all passing.