Merge pull request #224 from marcinsulikowski/support-python-3.10-and…

…-aiohttp-3.8

Support python 3.11 and aiohttp 3.8

.github/workflows/ci.yml

@@ -22,31 +22,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-minor-version: 6
-            aiohttp-version: aiohttp30
-            os: ubuntu-20.04
-          - python-minor-version: 6
-            aiohttp-version: aiohttp31
-            os: ubuntu-20.04
-          - python-minor-version: 6
-            aiohttp-version: aiohttp32
-            os: ubuntu-20.04
-          - python-minor-version: 6
-            aiohttp-version: aiohttp33
-            os: ubuntu-20.04
-          - python-minor-version: 6
-            aiohttp-version: aiohttp34
-            os: ubuntu-20.04
-          - python-minor-version: 6
-            aiohttp-version: aiohttp35
-            os: ubuntu-20.04
-          - python-minor-version: 6
-            aiohttp-version: aiohttp36
-            os: ubuntu-20.04
-          - python-minor-version: 6
-            aiohttp-version: aiohttp37
-            os: ubuntu-20.04
-
           - python-minor-version: 7
             aiohttp-version: aiohttp33
             os: ubuntu-latest
@@ -62,6 +37,9 @@ jobs:
           - python-minor-version: 7
             aiohttp-version: aiohttp37
             os: ubuntu-latest
+          - python-minor-version: 7
+            aiohttp-version: aiohttp38
+            os: ubuntu-latest
 
           - python-minor-version: 8
             aiohttp-version: aiohttp33
@@ -78,6 +56,9 @@ jobs:
           - python-minor-version: 8
             aiohttp-version: aiohttp37
             os: ubuntu-latest
+          - python-minor-version: 8
+            aiohttp-version: aiohttp38
+            os: ubuntu-latest
 
           - python-minor-version: 9
             aiohttp-version: aiohttp35
@@ -88,6 +69,20 @@ jobs:
           - python-minor-version: 9
             aiohttp-version: aiohttp37
             os: ubuntu-latest
+          - python-minor-version: 9
+            aiohttp-version: aiohttp38
+            os: ubuntu-latest
+
+          - python-minor-version: 10
+            aiohttp-version: aiohttp37
+            os: ubuntu-latest
+          - python-minor-version: 10
+            aiohttp-version: aiohttp38
+            os: ubuntu-latest
+
+          - python-minor-version: 11
+            aiohttp-version: aiohttp38
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

CONTRIBUTING.rst

@@ -101,7 +101,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.5, 3.6, 3.7 and for PyPy. Check
+3. The pull request should work for Python 3.7+ and for PyPy. Check
    https://travis-ci.org/pnuckowski/aioresponses/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

README.rst

@@ -40,8 +40,8 @@ Installing
 
 Supported versions
 ------------------
-- Python 3.5.3+
-- aiohttp>=2.0.0,<4.0.0
+- Python 3.7+
+- aiohttp>=3.3.0,<4.0.0
 
 Usage
 --------

aioresponses/compat.py

@@ -5,6 +5,7 @@
 from urllib.parse import parse_qsl, urlencode
 
 from aiohttp import __version__ as aiohttp_version, StreamReader
+from aiohttp.client_proto import ResponseHandler
 from multidict import MultiDict
 from pkg_resources import parse_version
 from yarl import URL
@@ -16,20 +17,12 @@
 
 AIOHTTP_VERSION = parse_version(aiohttp_version)
 
-if AIOHTTP_VERSION >= parse_version('3.0.0'):
-    from aiohttp.client_proto import ResponseHandler
 
-
-    def stream_reader_factory(  # noqa
-        loop: 'Optional[asyncio.AbstractEventLoop]' = None
-    ):
-        protocol = ResponseHandler(loop=loop)
-        return StreamReader(protocol, limit=2 ** 16, loop=loop)
-
-else:
-
-    def stream_reader_factory(loop=None):
-        return StreamReader()
+def stream_reader_factory(  # noqa
+    loop: 'Optional[asyncio.AbstractEventLoop]' = None
+) -> StreamReader:
+    protocol = ResponseHandler(loop=loop)
+    return StreamReader(protocol, limit=2 ** 16, loop=loop)
 
 
 def merge_params(

aioresponses/core.py

@@ -29,10 +29,8 @@
 )
 from aiohttp.helpers import TimerNoop
 from multidict import CIMultiDict, CIMultiDictProxy
-from pkg_resources import parse_version
 
 from .compat import (
-    AIOHTTP_VERSION,
     URL,
     Pattern,
     stream_reader_factory,
@@ -149,26 +147,22 @@ def _build_response(self, url: 'Union[URL, str]',
             body = str.encode(body)
         if request_headers is None:
             request_headers = {}
+        loop = Mock()
+        loop.get_debug = Mock()
+        loop.get_debug.return_value = True
         kwargs = {}  # type: Dict[str, Any]
-        if AIOHTTP_VERSION >= parse_version('3.1.0'):
-            loop = Mock()
-            loop.get_debug = Mock()
-            loop.get_debug.return_value = True
-            kwargs['request_info'] = RequestInfo(
-                url=url,
-                method=method,
-                headers=CIMultiDictProxy(CIMultiDict(**request_headers)),
-            )
-            kwargs['writer'] = Mock()
-            kwargs['continue100'] = None
-            kwargs['timer'] = TimerNoop()
-            if AIOHTTP_VERSION < parse_version('3.3.0'):
-                kwargs['auto_decompress'] = True
-            kwargs['traces'] = []
-            kwargs['loop'] = loop
-            kwargs['session'] = None
-        else:
-            loop = None
+        kwargs['request_info'] = RequestInfo(
+            url=url,
+            method=method,
+            headers=CIMultiDictProxy(CIMultiDict(**request_headers)),
+        )
+        kwargs['writer'] = Mock()
+        kwargs['continue100'] = None
+        kwargs['timer'] = TimerNoop()
+        kwargs['traces'] = []
+        kwargs['loop'] = loop
+        kwargs['session'] = None
+
         # We need to initialize headers manually
         _headers = CIMultiDict({hdrs.CONTENT_TYPE: content_type})
         if headers:
@@ -179,13 +173,10 @@ def _build_response(self, url: 'Union[URL, str]',
         for hdr in _headers.getall(hdrs.SET_COOKIE, ()):
             resp.cookies.load(hdr)
 
-        if AIOHTTP_VERSION >= parse_version('3.3.0'):
-            # Reified attributes
-            resp._headers = _headers
-            resp._raw_headers = raw_headers
-        else:
-            resp.headers = _headers
-            resp.raw_headers = raw_headers
+        # Reified attributes
+        resp._headers = _headers
+        resp._raw_headers = raw_headers
+
         resp.status = status
         resp.reason = reason
         resp.content = stream_reader_factory(loop)

requirements-dev.txt

@@ -4,10 +4,10 @@ flake8==3.8.3
 tox==3.19.0
 coverage==5.2.1
 Sphinx==1.5.6
-pytest==6.0.1
+pytest==7.1.3
 pytest-cov==2.10.1
 pytest-html==2.1.1
 ddt==1.4.1
 typing
 asynctest==0.13.0
-yarl==1.7.2
+yarl==1.8.2

requirements.txt

@@ -1 +1 @@
-aiohttp>=2.0.0,<4.0.0
+aiohttp>=3.3.0,<4.0.0

setup.cfg

@@ -15,10 +15,11 @@ classifier =
   License :: OSI Approved :: MIT License
   Natural Language :: English
   Programming Language :: Python :: 3
-  Programming Language :: Python :: 3.6
   Programming Language :: Python :: 3.7
   Programming Language :: Python :: 3.8
   Programming Language :: Python :: 3.9
+  Programming Language :: Python :: 3.10
+  Programming Language :: Python :: 3.11
 
 [files]
 packages =

tests/test_aioresponses.py

@@ -333,7 +333,7 @@ async def test_raising_exception(self):
                         callback=lambda *_, **__: callback_called.set())
             with self.assertRaises(HttpProcessingError):
                 await self.session.get(url)
-            
+
             await callback_called.wait()
 
     async def test_multiple_requests(self):
@@ -742,8 +742,6 @@ async def test_redirect_missing_location_header(self, rsps):
         self.assertEqual(str(response.url), self.url)
 
     @aioresponses()
-    @skipIf(condition=AIOHTTP_VERSION < parse_version('3.1.0'),
-            reason='aiohttp<3.1.0 does not add request info on response')
     async def test_request_info(self, rsps):
         rsps.get(self.url, status=200)
 
@@ -754,8 +752,6 @@ async def test_request_info(self, rsps):
         assert request_info.headers == {}
 
     @aioresponses()
-    @skipIf(condition=AIOHTTP_VERSION < parse_version('3.1.0'),
-            reason='aiohttp<3.1.0 does not add request info on response')
     async def test_request_info_with_original_request_headers(self, rsps):
         headers = {"Authorization": "Bearer access-token"}
         rsps.get(self.url, status=200)

tox.ini

@@ -2,10 +2,11 @@
 envlist =
     flake8,
     coverage,
-    py36-aiohttp{30,31,32,33,34,35,36,37}
-    py37-aiohttp{33,34,35,36,37}
-    py38-aiohttp{33,34,35,36,37}
-    py39-aiohttp{37}
+    py37-aiohttp{33,34,35,36,37,38}
+    py38-aiohttp{33,34,35,36,37,38}
+    py39-aiohttp{37,38}
+    py310-aiohttp{37,38}
+    py31-aiohttp38
 skipsdist = True
 
 [testenv:flake8]
@@ -20,21 +21,12 @@ setenv =
 passenv = PYTEST_ADDOPTS
 
 deps =
-    aiohttp20: aiohttp>=2.0,<2.1
-    aiohttp20: yarl<1.2.0
-    aiohttp21: aiohttp>=2.1,<2.2
-    aiohttp21: yarl<1.2.0
-    aiohttp22: aiohttp>=2.2,<2.3
-    aiohttp22: yarl<1.2.0
-    aiohttp23: aiohttp>=2.3,<2.4
-    aiohttp30: aiohttp>=3.0,<3.1
-    aiohttp31: aiohttp>=3.1,<3.2
-    aiohttp32: aiohttp>=3.2,<3.3
     aiohttp33: aiohttp>=3.3,<3.4
     aiohttp34: aiohttp>=3.4,<3.5
     aiohttp35: aiohttp>=3.5,<3.6
     aiohttp36: aiohttp>=3.6,<3.7
     aiohttp37: aiohttp>=3.7,<3.8
+    aiohttp38: aiohttp>=3.8,<3.9
     -r{toxinidir}/requirements-dev.txt
 
 commands = python -m pytest {posargs}