Skip to content

Commit 34c8e00

Browse files
authored
Merge branch 'master' into feat-media-channels
2 parents 8379afb + dbd9f1b commit 34c8e00

File tree

6 files changed

+15
-3
lines changed

6 files changed

+15
-3
lines changed

.github/workflows/docs-localization-download.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
working-directory: ./docs
4141
- name: "Crowdin"
4242
id: crowdin
43-
uses: crowdin/[email protected].1
43+
uses: crowdin/[email protected].2
4444
with:
4545
upload_sources: false
4646
upload_translations: false

.github/workflows/docs-localization-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
4545
working-directory: ./docs
4646
- name: "Crowdin"
47-
uses: crowdin/[email protected].1
47+
uses: crowdin/[email protected].2
4848
with:
4949
upload_sources: true
5050
upload_translations: false

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ These changes are available on the `master` branch, but have not yet been releas
8585
- Fixed attachment metadata being set incorrectly in interaction responses causing the
8686
metadata to be ignored by Discord.
8787
([#2679](https://github.com/Pycord-Development/pycord/pull/2679))
88+
- Fixed unexpected backoff behavior in the handling of task failures
89+
([#2700](https://github.com/Pycord-Development/pycord/pull/2700)).
8890

8991
### Changed
9092

discord/ext/tasks/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ async def _loop(self, *args: Any, **kwargs: Any) -> None:
168168
try:
169169
await self.coro(*args, **kwargs)
170170
self._last_iteration_failed = False
171+
backoff = ExponentialBackoff()
171172
except self._valid_exception:
172173
self._last_iteration_failed = True
173174
if not self.reconnect:

docs/conf.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,15 @@ def write_new():
487487
r"https://packages.debian.org/.*",
488488
]
489489

490+
linkcheck_exclude_documents = [
491+
r".*/migrating_to_v1.*",
492+
r".*/migrating_to_v2.*",
493+
r".*/old_changelog.*",
494+
r"migrating_to_v1.*",
495+
r"migrating_to_v2.*",
496+
r"old_changelog.*"
497+
]
498+
490499
linkcheck_anchors_ignore_for_url = [r"https://github.com/Delitefully/DiscordLists"]
491500

492501
modindex_common_prefix = ["discord."]

requirements/dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ pytest-asyncio~=0.23.8
66
mypy~=1.14.1
77
coverage~=7.6
88
pre-commit==4.1.0
9-
codespell==2.3.0
9+
codespell==2.4.0
1010
bandit==1.8.2
1111
flake8==7.1.1

0 commit comments

Comments
 (0)