[IP-8338] Update fork to match upstream#6
Draft
cody-brock wants to merge 286 commits into
Draft
Conversation
…#261 (celery#477) * feat: add periodic_task_name * docs and tests * more detail docs Co-authored-by: mba <mba@host.local>
… is enabled. (celery#464) * Fix ClockedSchedule showing UTC time and ignoring Timezone * Force datatime to have timezone information * Force datatime to have timezone information-removing unused import Co-authored-by: Mohamed Hamdy <hamdy@shekra.com>
* replace django 3.1 to django 4.0 * update django
* update tox for new CI & versions * update versions matrix
* Add korean translation * Remove fuzzy * Fix awkward translations * Update django_celery_beat/locale/ko/LC_MESSAGES/django.po Co-authored-by: Lee Ho Sung <lee.ho.sung@gmail.com> * Update django_celery_beat/locale/ko/LC_MESSAGES/django.po Co-authored-by: Lee Ho Sung <lee.ho.sung@gmail.com> * Follow Korean foreign language translation guideline Co-authored-by: Asif Saif Uddin <auvipy@gmail.com> Co-authored-by: Lee Ho Sung <lee.ho.sung@gmail.com>
…#501) * Add last_run_at=None when disable_tasks using admin action * Add disable_tasks test * Add author name * Change import order * Add Changelog entry
* add basic RTD configuration Signed-off-by: Oleg Hoefling <oleg.hoefling@gmail.com> * include default dependencies in docs requirements Signed-off-by: Oleg Hoefling <oleg.hoefling@gmail.com> * fix sphinx warnings, use crossrefs where possible, minor style fixes Signed-off-by: Oleg Hoefling <oleg.hoefling@gmail.com> * Update docs/includes/introduction.txt Co-authored-by: Asif Saif Uddin <auvipy@gmail.com> * Update .readthedocs.yaml Co-authored-by: Asif Saif Uddin <auvipy@gmail.com> Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
Co-authored-by: Samsong <songyi@andoner.com> Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
* initial draft * Update test.yml Use test.txt requirement * try tox * install tox * update Co-authored-by: saschahofmann <sascha.kelevra@gmail.com>
* Added support for compose env vars (celery#532) Added `.env` to `.gitignore`. Added a `.env.sample` that will be used by anyone he need it. Just copy it as `.env` in your local devel env and use the (supported) variables you need. `docker-compose.yml` updated in order to support string interpolation when using variables defined in a `.env` file. Fixed a typo in `issue_template.md`. * newline * newline Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
* refactor: use super() in is_due() method * test: add some tests * pre commit * fix: schedulers * fix: test mistake
updates: - [github.com/adamchainz/django-upgrade: 1.24.0 → 1.25.0](adamchainz/django-upgrade@1.24.0...1.25.0) - [github.com/astral-sh/ruff-pre-commit: v0.11.9 → v0.11.10](astral-sh/ruff-pre-commit@v0.11.9...v0.11.10) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/asottile/pyupgrade: v3.19.1 → v3.20.0](asottile/pyupgrade@v3.19.1...v3.20.0) - [github.com/astral-sh/ruff-pre-commit: v0.11.10 → v0.11.11](astral-sh/ruff-pre-commit@v0.11.10...v0.11.11) - [github.com/tox-dev/pyproject-fmt: v2.5.1 → v2.6.0](tox-dev/pyproject-fmt@v2.5.1...v2.6.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.11 → v0.11.12](astral-sh/ruff-pre-commit@v0.11.11...v0.11.12) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.12 → v0.11.13](astral-sh/ruff-pre-commit@v0.11.12...v0.11.13) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/PyCQA/flake8: 7.2.0 → 7.3.0](PyCQA/flake8@7.2.0...7.3.0) - [github.com/astral-sh/ruff-pre-commit: v0.11.13 → v0.12.7](astral-sh/ruff-pre-commit@v0.11.13...v0.12.7) * Revert ruff upgrade --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Christian Clauss <cclauss@me.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.8 → v0.11.9](astral-sh/ruff-pre-commit@v0.11.8...v0.11.9) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * pypy-3.11 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christian Clauss <cclauss@me.com>
* Bump actions/download-artifact from 4 to 5 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4 to 5. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v4...v5) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} * Apply suggestion from @cclauss --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christian Clauss <cclauss@me.com>
* Remove Python2 'next' assignment in scheduler Remove unnecessary compatibility code for legacy Python 2 which is no longer supported. * Use Python3 next
updates: - [github.com/astral-sh/ruff-pre-commit: v0.12.9 → v0.12.10](astral-sh/ruff-pre-commit@v0.12.9...v0.12.10) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/adamchainz/django-upgrade: 1.25.0 → 1.27.0](adamchainz/django-upgrade@1.25.0...1.27.0) - [github.com/astral-sh/ruff-pre-commit: v0.12.10 → v0.12.11](astral-sh/ruff-pre-commit@v0.12.10...v0.12.11) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.12.11 → v0.12.12](astral-sh/ruff-pre-commit@v0.12.11...v0.12.12) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/adamchainz/django-upgrade: 1.27.0 → 1.28.0](adamchainz/django-upgrade@1.27.0...1.28.0) - [github.com/astral-sh/ruff-pre-commit: v0.12.12 → v0.13.0](astral-sh/ruff-pre-commit@v0.12.12...v0.13.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* GitHub Actions: Test on Python 3.14 release candidate 2 Python v3.14 -- October 7th * https://www.python.org/download/pre-releases * https://www.python.org/downloads/release/python-3140rc2 * tox.ini: py314-django{52}
updates: - [github.com/astral-sh/ruff-pre-commit: v0.13.0 → v0.13.1](astral-sh/ruff-pre-commit@v0.13.0...v0.13.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.13.1 → v0.13.2](astral-sh/ruff-pre-commit@v0.13.1...v0.13.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/pycqa/isort: 6.0.1 → 6.1.0](PyCQA/isort@6.0.1...6.1.0) - [github.com/adamchainz/django-upgrade: 1.28.0 → 1.29.0](adamchainz/django-upgrade@1.28.0...1.29.0) - [github.com/astral-sh/ruff-pre-commit: v0.13.2 → v0.13.3](astral-sh/ruff-pre-commit@v0.13.2...v0.13.3) - [github.com/tox-dev/pyproject-fmt: v2.6.0 → v2.7.0](tox-dev/pyproject-fmt@v2.6.0...v2.7.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/asottile/pyupgrade: v3.20.0 → v3.21.0](asottile/pyupgrade@v3.20.0...v3.21.0) - [github.com/pycqa/isort: 6.1.0 → 7.0.0](PyCQA/isort@6.1.0...7.0.0) - [github.com/astral-sh/ruff-pre-commit: v0.13.3 → v0.14.0](astral-sh/ruff-pre-commit@v0.13.3...v0.14.0) - [github.com/tox-dev/pyproject-fmt: v2.7.0 → v2.10.0](tox-dev/pyproject-fmt@v2.7.0...v2.10.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.0 → v0.14.1](astral-sh/ruff-pre-commit@v0.14.0...v0.14.1) - [github.com/tox-dev/pyproject-fmt: v2.10.0 → v2.11.0](tox-dev/pyproject-fmt@v2.10.0...v2.11.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/adamchainz/django-upgrade: 1.29.0 → 1.29.1](adamchainz/django-upgrade@1.29.0...1.29.1) - [github.com/astral-sh/ruff-pre-commit: v0.14.1 → v0.14.2](astral-sh/ruff-pre-commit@v0.14.1...v0.14.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.2 → v0.14.3](astral-sh/ruff-pre-commit@v0.14.2...v0.14.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/asottile/pyupgrade: v3.21.0 → v3.21.1](asottile/pyupgrade@v3.21.0...v3.21.1) - [github.com/astral-sh/ruff-pre-commit: v0.14.3 → v0.14.5](astral-sh/ruff-pre-commit@v0.14.3...v0.14.5) - [github.com/tox-dev/pyproject-fmt: v2.11.0 → v2.11.1](tox-dev/pyproject-fmt@v2.11.0...v2.11.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Remove upper bound on Django version
* Update requirements/runtime.txt
---------
Co-authored-by: Asif Saif Uddin {"Auvi":"অভি"} <auvipy@gmail.com>
updates: - [github.com/asottile/pyupgrade: v3.21.1 → v3.21.2](asottile/pyupgrade@v3.21.1...v3.21.2) - [github.com/astral-sh/ruff-pre-commit: v0.14.5 → v0.14.6](astral-sh/ruff-pre-commit@v0.14.5...v0.14.6) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.6 → v0.14.7](astral-sh/ruff-pre-commit@v0.14.6...v0.14.7) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Wiz Scan Summary
To detect these findings earlier in the dev lifecycle, try using Wiz Code VS Code Extension. |
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
20 participants
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.
Description
Our fork is currently based off of commits from django-celery-beat 2.2.0 (see here). This PR updates our forked repo to include the most recent commits from the upstream, which is currently at 2.8.0.
Doing this as part of updating celery in platform repo. Also, it seems the django-celery-beat didn't announce support for django 4.2 until here in 2.5.0, and our forked version is based on 2.2.0.
Link to Jira ticket
How I did this
Cloned bevy/django-celery-beat. Validated that the upstream celery/django-celery-beat has its latest release (2.8.1) matching what is on its main branch exactly - celery/django-celery-beat@main...v2.8.1. Then, I first tried doing a rebase with main -- this made git history really messy. So I instead did a merge commit, and manually resolved the conflicts, erring on the side of keeping the changes from the upstream.
How I tested this
(going to make a branch on platform that uses this version of django-celery-beat, then try things out)