Merge branch 'master' into fix/NotImplementedError

.github/workflows/python-test-versions.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         poetry-version: ["1.2.2", "1.3.1"]
 
     steps:

.gitignore

@@ -212,3 +212,4 @@ pip-selfcheck.json
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 
+docs/source/_build/

pyproject.toml

@@ -30,7 +30,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-aiohttp = "^3.9.0"
+aiohttp = "3.9.1"
 aiodns = "^3.0.0"
 attrs = "^22.1.0"
 maxminddb = "^2.2.0"

tests/test_resolver.py

@@ -1,4 +1,5 @@
 import socket
+from unittest.mock import AsyncMock
 
 import pytest
 
@@ -34,15 +35,12 @@ def test_get_ip_info(resolver):
 @pytest.mark.asyncio
 async def test_get_real_ext_ip(event_loop, mocker, resolver):
     async def f(*args, **kwargs):
-        async def side_effect(*args, **kwargs):
-            return '127.0.0.1\n'
+        return '127.0.0.1\n'
 
-        resp = mocker.Mock()
-        resp.text.side_effect = side_effect
-        return resp
+    resp = AsyncMock()
+    resp.text = f
 
-    # https://github.com/pytest-dev/pytest-mock#note-about-usage-as-context-manager
-    mocker.patch('aiohttp.client.ClientSession._request', side_effect=f)
+    mocker.patch('aiohttp.client.ClientSession._request', return_value=resp)
     assert await resolver.get_real_ext_ip() == '127.0.0.1'