diff --git a/CHANGES/6857.misc b/CHANGES/6857.misc new file mode 100644 index 00000000000..3af5791308c --- /dev/null +++ b/CHANGES/6857.misc @@ -0,0 +1,2 @@ +Excluded :term:`cchardet` from the ``speedups`` extra in the package +metadata under Python 3.10 or higher -- by :user:`webknjaz`. diff --git a/docs/_snippets/cchardet-unmaintained-admonition.rst b/docs/_snippets/cchardet-unmaintained-admonition.rst new file mode 100644 index 00000000000..ec290e0e954 --- /dev/null +++ b/docs/_snippets/cchardet-unmaintained-admonition.rst @@ -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. diff --git a/docs/glossary.rst b/docs/glossary.rst index 1de13dc7d04..497f901176b 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -59,6 +59,8 @@ https://pypi.python.org/pypi/cchardet/ + .. include:: _snippets/cchardet-unmaintained-admonition.rst + gunicorn Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for diff --git a/docs/index.rst b/docs/index.rst index 4ad00d462e0..ed9664bdd7c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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: diff --git a/requirements/base.txt b/requirements/base.txt index b9a602d76b3..f5013b23a3b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,7 @@ aiosignal==1.2.0 async-timeout==4.0.2 asynctest==0.13.0; python_version<"3.8" 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 diff --git a/setup.cfg b/setup.cfg index e6dd14bc085..d1ae46a30d4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -65,7 +65,7 @@ install_requires = speedups = aiodns >= 1.1 Brotli - cchardet + cchardet; python_version < "3.10" [options.packages.find] exclude =