Skip to content

Commit

Permalink
Merge branch 'master' into feat-media-channels
Browse files Browse the repository at this point in the history
  • Loading branch information
plun1331 authored Jan 28, 2025
2 parents 8379afb + dbd9f1b commit 34c8e00
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-localization-download.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
working-directory: ./docs
- name: "Crowdin"
id: crowdin
uses: crowdin/[email protected].1
uses: crowdin/[email protected].2
with:
upload_sources: false
upload_translations: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-localization-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
working-directory: ./docs
- name: "Crowdin"
uses: crowdin/[email protected].1
uses: crowdin/[email protected].2
with:
upload_sources: true
upload_translations: false
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ These changes are available on the `master` branch, but have not yet been releas
- Fixed attachment metadata being set incorrectly in interaction responses causing the
metadata to be ignored by Discord.
([#2679](https://github.com/Pycord-Development/pycord/pull/2679))
- Fixed unexpected backoff behavior in the handling of task failures
([#2700](https://github.com/Pycord-Development/pycord/pull/2700)).

### Changed

Expand Down
1 change: 1 addition & 0 deletions discord/ext/tasks/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ async def _loop(self, *args: Any, **kwargs: Any) -> None:
try:
await self.coro(*args, **kwargs)
self._last_iteration_failed = False
backoff = ExponentialBackoff()
except self._valid_exception:
self._last_iteration_failed = True
if not self.reconnect:
Expand Down
9 changes: 9 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,15 @@ def write_new():
r"https://packages.debian.org/.*",
]

linkcheck_exclude_documents = [
r".*/migrating_to_v1.*",
r".*/migrating_to_v2.*",
r".*/old_changelog.*",
r"migrating_to_v1.*",
r"migrating_to_v2.*",
r"old_changelog.*"
]

linkcheck_anchors_ignore_for_url = [r"https://github.com/Delitefully/DiscordLists"]

modindex_common_prefix = ["discord."]
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ pytest-asyncio~=0.23.8
mypy~=1.14.1
coverage~=7.6
pre-commit==4.1.0
codespell==2.3.0
codespell==2.4.0
bandit==1.8.2
flake8==7.1.1

0 comments on commit 34c8e00

Please sign in to comment.