Skip to content

Commit

Permalink
Merge branch 'master' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorukyum authored Nov 26, 2023
2 parents 24a4f36 + f6ac778 commit 24614d3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ These changes are available on the `master` branch, but have not yet been releas
([#2192](https://github.com/Pycord-Development/pycord/pull/2192))
- Fixed `DMChannel.recipient` being `None` and consequently `User.dm_channel` also being
`None`. ([#2219](https://github.com/Pycord-Development/pycord/pull/2219))
- Fixed ffmpeg being terminated prematurely when piping audio stream.
([#2240](https://github.com/Pycord-Development/pycord/pull/2240))

## [2.4.1] - 2023-03-20

Expand Down
2 changes: 1 addition & 1 deletion discord/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def _pipe_writer(self, source: io.BufferedIOBase) -> None:
# arbitrarily large read size
data = source.read(8192)
if not data:
self._process.terminate()
self._stdin.close()
return
try:
self._stdin.write(data)
Expand Down
2 changes: 1 addition & 1 deletion requirements/_.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
aiohttp>=3.6.0,<3.9.0
aiohttp>=3.6.0,<3.10.0
typing_extensions>=4,<5; python_version < "3.11"
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pylint~=2.17.5
pytest~=7.4.3
pytest-asyncio~=0.21.1
# pytest-order~=1.0.1
mypy~=1.5.1
mypy~=1.7.1
coverage~=7.3
pre-commit==3.5.0
codespell==2.2.6
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sphinx==5.3.0
sphinxcontrib_trio==1.1.2
sphinxcontrib-websupport==1.2.4
myst-parser==1.0.0
sphinxext-opengraph==0.8.2
sphinxext-opengraph==0.9.0
sphinx-copybutton==0.5.2
furo@ git+https://github.com/pradyunsg/furo@193643f
sphinx-autodoc-typehints==1.23.0

0 comments on commit 24614d3

Please sign in to comment.