python310Packages.aiohttp: 3.8.5 -> 3.8.6

buildPythonPackage rec {

  pname = "aiohttp";

  version = "3.8.5";

  version = "3.8.6";

  format = "pyproject";

  disabled = pythonOlder "3.6";

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw=";

    hash = "sha256-sM8qRQG/+TMKilJItM6VGFHkFb3M6dwVjnbP1V4VCFw=";

  };

  patches = [

    (fetchpatch {

      # https://github.com/aio-libs/aiohttp/pull/7260

      # Merged upstream, should likely be dropped post-3.8.5

      # Merged upstream, should be dropped once updated to 3.9.0

      url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch";

      hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g=";

    })

    # https://github.com/aio-libs/aiohttp/pull/7454 but does not merge cleanly

    ./setuptools-67.5.0-compatibility.diff

  ];

  postPatch = ''

diff --git a/setup.cfg b/setup.cfg

index 6944b7e2..dfa65d69 100644

--- a/setup.cfg

+++ b/setup.cfg

@@ -128,6 +128,7 @@ filterwarnings =

 	ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning::

 	ignore:module 'sre_constants' is deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing

 	ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core

+	ignore:pkg_resources is deprecated as an API:DeprecationWarning

 junit_suite_name = aiohttp_test_suite

 norecursedirs = dist docs build .tox .eggs

 minversion = 3.8.2

diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py

index 22e5ea47..a655fd1d 100644

--- a/tests/test_circular_imports.py

+++ b/tests/test_circular_imports.py

@@ -113,6 +113,10 @@ def test_no_warnings(import_path: str) -> None:

         "-W",

         "ignore:Creating a LegacyVersion has been deprecated and will "

         "be removed in the next major release:DeprecationWarning:",

+        # Deprecation warning emitted by setuptools v67.5.0+ triggered by importing

+        # `gunicorn.util`.

+        "-W", "ignore:pkg_resources is deprecated as an API:"

+        "DeprecationWarning",

         "-c", f"import {import_path!s}",

         # fmt: on

     )