Stop installing cchardet speedup under >Python 3.9

`cchardet` stopped being maintained a while ago so this patch removes it from the `speedups` extra to keep it helpful. It also makes the same adjustment in the CI under the most recent CPython versions to keep the testing going. Refs: * aio-libs#6819 (comment) * PyYoshi/cChardet#77
webknjaz · Aug 3, 2022 · 16e3e5a · 16e3e5a
1 parent 0db3362
commit 16e3e5a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/CHANGES/6857.misc 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -65,7 +65,7 @@ install_requires =
 speedups =
   aiodns >= 1.1
   Brotli
-  cchardet
+  cchardet; python_version < "3.10"
 
 [options.packages.find]
 exclude =
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`.