Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PR #6857/1e8c40fe backport][3.9] Stop installing cchardet speedup under >Python 3.9 #6861

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES/6857.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Excluded :term:`cchardet` from the ``speedups`` extra in the package
metadata under Python 3.10 or higher -- by :user:`webknjaz`.
5 changes: 5 additions & 0 deletions docs/_snippets/cchardet-unmaintained-admonition.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.. warning::

Note that the :term:`cchardet` project is known not to support
Python 3.10 or higher. See :issue:`6819` and
:gh:`PyYoshi/cChardet/issues/77` for more details.
2 changes: 2 additions & 0 deletions docs/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@

https://pypi.python.org/pypi/cchardet/

.. include:: _snippets/cchardet-unmaintained-admonition.rst

gunicorn

Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ replacement for :term:`charset-normalizer`:

$ pip install cchardet

.. include:: _snippets/cchardet-unmaintained-admonition.rst

For speeding up DNS resolving by client API you may install
:term:`aiodns` as well.
This option is highly recommended:
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ async-timeout==4.0.2
asynctest==0.13.0; python_version<"3.8"
attrs==21.4.0
Brotli==1.0.9
cchardet==2.1.7
cchardet==2.1.7; python_version < "3.10" # Unmaintained: aio-libs/aiohttp#6819
charset-normalizer==2.0.12
frozenlist==1.3.1
gunicorn==20.1.0
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ install_requires =
speedups =
aiodns
Brotli
cchardet
cchardet; python_version < "3.10"

[options.packages.find]
exclude =
Expand Down