Skip to content

Commit 92d32f4

Browse files
KludexKludex
authored
Merge branch 'main' into typing/concurrency/solo
2 parents 9dc6ade + 919a848 commit 92d32f4

153 files changed

Lines changed: 2999 additions & 451 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.codespellrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[codespell]
2+
skip = .git,.venv,*.svg,package-lock.json,*.key
3+
# Some names and timezone (lower cased)
4+
ignore-words-list = gool,markey,sherif,wil,ist,fromm,brane,bu,nott

‎.cookiecutterrc‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.coveragerc‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/Bug-Report.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ bug reports which are incomplete.
1616
<!--
1717
To check an item on the list replace [ ] with [x].
1818
-->
19-
- [ ] I have verified that the issue exists against the `master` branch of Celery.
19+
- [ ] I have verified that the issue exists against the `main` branch of Celery.
2020
- [ ] This has already been asked to the [discussions forum](https://github.com/celery/celery/discussions) first.
2121
- [ ] I have read the relevant section in the
22-
[contribution guide](https://docs.celeryq.dev/en/master/contributing.html#other-bugs)
22+
[contribution guide](https://docs.celeryq.dev/en/main/contributing.html#other-bugs)
2323
on reporting bugs.
2424
- [ ] I have checked the [issues list](https://github.com/celery/celery/issues?q=is%3Aissue+label%3A%22Issue+Type%3A+Bug+Report%22+-label%3A%22Category%3A+Documentation%22)
2525
for similar or identical bug reports.
2626
- [ ] I have checked the [pull requests list](https://github.com/celery/celery/pulls?q=is%3Apr+label%3A%22PR+Type%3A+Bugfix%22+-label%3A%22Category%3A+Documentation%22)
2727
for existing proposed fixes.
28-
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/master)
29-
to find out if the bug was already fixed in the master branch.
28+
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/main)
29+
to find out if the bug was already fixed in the main branch.
3030
- [ ] I have included all related issues and possible duplicate issues
3131
in this issue (If there are none, check this box anyway).
3232

@@ -35,7 +35,7 @@ To check an item on the list replace [ ] with [x].
3535
- [ ] I have included the output of ``celery -A proj report`` in the issue.
3636
(if you are not able to do this, then at least specify the Celery
3737
version affected).
38-
- [ ] I have verified that the issue exists against the `master` branch of Celery.
38+
- [ ] I have verified that the issue exists against the `main` branch of Celery.
3939
- [ ] I have included the contents of ``pip freeze`` in the issue.
4040
- [ ] I have included all the versions of all the external dependencies required
4141
to reproduce this bug.
@@ -96,14 +96,14 @@ on the subject: https://help.github.com/en/articles/autolinked-references-and-ur
9696

9797
## Required Dependencies
9898
<!-- Please fill the required dependencies to reproduce this issue -->
99-
* **Minimal Python Version**: N/A or Unknown
100-
* **Minimal Celery Version**: N/A or Unknown
101-
* **Minimal Kombu Version**: N/A or Unknown
102-
* **Minimal Broker Version**: N/A or Unknown
103-
* **Minimal Result Backend Version**: N/A or Unknown
104-
* **Minimal OS and/or Kernel Version**: N/A or Unknown
105-
* **Minimal Broker Client Version**: N/A or Unknown
106-
* **Minimal Result Backend Client Version**: N/A or Unknown
99+
- **Minimal Python Version**: N/A or Unknown
100+
- **Minimal Celery Version**: N/A or Unknown
101+
- **Minimal Kombu Version**: N/A or Unknown
102+
- **Minimal Broker Version**: N/A or Unknown
103+
- **Minimal Result Backend Version**: N/A or Unknown
104+
- **Minimal OS and/or Kernel Version**: N/A or Unknown
105+
- **Minimal Broker Client Version**: N/A or Unknown
106+
- **Minimal Result Backend Client Version**: N/A or Unknown
107107

108108
### Python Packages
109109
<!-- Please fill the contents of pip freeze below -->

‎.github/ISSUE_TEMPLATE/Documentation-Bug-Report.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ To check an item on the list replace [ ] with [x].
2121
for similar or identical bug reports.
2222
- [ ] I have checked the [pull requests list](https://github.com/celery/celery/pulls?q=is%3Apr+label%3A%22Category%3A+Documentation%22)
2323
for existing proposed fixes.
24-
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/master)
25-
to find out if the bug was already fixed in the master branch.
24+
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/main)
25+
to find out if the bug was already fixed in the main branch.
2626
- [ ] I have included all related issues and possible duplicate issues in this issue
2727
(If there are none, check this box anyway).
2828

‎.github/ISSUE_TEMPLATE/Enhancement.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ To check an item on the list replace [ ] with [x].
2121
for similar or identical enhancement to an existing feature.
2222
- [ ] I have checked the [pull requests list](https://github.com/celery/celery/pulls?q=is%3Apr+label%3A%22Issue+Type%3A+Enhancement%22+-label%3A%22Category%3A+Documentation%22)
2323
for existing proposed enhancements.
24-
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/master)
24+
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/main)
2525
to find out if the if the same enhancement was already implemented in the
26-
master branch.
26+
main branch.
2727
- [ ] I have included all related issues and possible duplicate issues in this issue
2828
(If there are none, check this box anyway).
2929

‎.github/ISSUE_TEMPLATE/Feature-Request.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ To check an item on the list replace [ ] with [x].
2121
for similar or identical feature requests.
2222
- [ ] I have checked the [pull requests list](https://github.com/celery/celery/pulls?utf8=%E2%9C%93&q=is%3Apr+label%3A%22PR+Type%3A+Feature%22+)
2323
for existing proposed implementations of this feature.
24-
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/master)
24+
- [ ] I have checked the [commit log](https://github.com/celery/celery/commits/main)
2525
to find out if the same feature was already implemented in the
26-
master branch.
26+
main branch.
2727
- [ ] I have included all related issues and possible duplicate issues
2828
in this issue (If there are none, check this box anyway).
2929

‎.github/ISSUE_TEMPLATE/Major-Version-Release-Checklist.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Release PR: <!-- Insert Release PR Here -->
2020
- [ ] Milestone is 100% done
2121
- [ ] Merge Freeze
2222
- [ ] Release PR reviewed
23-
- [ ] The master branch build passes
23+
- [ ] The main branch build passes
2424

2525
[![Build Status](https://github.com/celery/celery/actions/workflows/python-package.yml/badge.svg)](https://github.com/celery/celery/actions/workflows/python-package.yml)
2626
- [ ] Release Notes

‎.github/ISSUE_TEMPLATE/Minor-Version-Release-Checklist.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Release PR: <!-- Insert Release PR Here -->
1414

1515
- [ ] Release PR drafted
1616
- [ ] Release PR reviewed
17-
- [ ] The master branch build passes
17+
- [ ] The main branch build passes
1818

1919
[![Build Status](https://github.com/celery/celery/actions/workflows/python-package.yml/badge.svg)](https://github.com/celery/celery/actions/workflows/python-package.yml)
2020
- [ ] Release Notes

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
*Note*: Before submitting this pull request, please review our [contributing
2-
guidelines](https://docs.celeryq.dev/en/master/contributing.html).
2+
guidelines](https://docs.celeryq.dev/en/main/contributing.html).
33

44
## Description
55

66
<!-- Please describe your pull request.
77
8-
NOTE: All patches should be made against master, not a maintenance branch like
9-
3.1, 2.5, etc. That is unless the bug is already fixed in master, but not in
8+
NOTE: All patches should be made against main, not a maintenance branch like
9+
3.1, 2.5, etc. That is unless the bug is already fixed in main, but not in
1010
that version series.
1111
1212
If it fixes a bug or resolves a feature request,

0 commit comments

Comments
 (0)