Move contrib/aiohttp tests to riot (backport #2866) (#2972)

* Move aiohttp tests to riot

Migrate aiohttp from tox to riot. Fixes #1370

* Pin async-timeout to <4.0.0 for older aiohttp versions (#2963)

async-timeout introduces a breaking change (changing the `timeout` class
to a function) which breaks older versions of aiohttp.

Co-authored-by: Munir Abdinur <[email protected]>
Co-authored-by: Kyle Verhoog <[email protected]>

Author: 3 people

.circleci/config.yml

@@ -465,8 +465,8 @@ jobs:
   aiohttp:
     <<: *contrib_job
     steps:
-      - run_tox_scenario:
-          pattern: '^aiohttp_contrib-'
+      - run_test:
+          pattern: 'aiohttp'
 
   asgi:
     <<: *contrib_job_small

riotfile.py

@@ -1183,6 +1183,33 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
             },
             command="pytest {cmdargs} tests/contrib/aiopg",
         ),
+        Venv(
+            name="aiohttp",
+            command="pytest {cmdargs} tests/contrib/aiohttp",
+            pkgs={
+                "pytest-aiohttp": [latest],
+            },
+            venvs=[
+                Venv(
+                    pys=select_pys(min_version="3.5", max_version="3.6"),
+                    pkgs={
+                        "aiohttp": ["~=2.0", "~=2.1", "~=2.2", "~=2.3"],
+                        "aiohttp_jinja2": ["~=0.12", "~=0.13", "~=0.15"],
+                        "async-timeout": ["<4.0.0"],
+                        "yarl": "~=0.18.0",
+                    },
+                ),
+                Venv(
+                    # Python 3.5 is deprecated for aiohttp >= 3.0
+                    pys=select_pys(min_version="3.6"),
+                    pkgs={
+                        "aiohttp": ["~=3.0", "~=3.1", "~=3.2", "~=3.3", "~=3.4", "~=3.5", "~=3.6"],
+                        "aiohttp_jinja2": "~=0.15",
+                        "yarl": "~=1.0",
+                    },
+                ),
+            ],
+        ),
         Venv(
             name="jinja2",
             venvs=[

tests/contrib/aiohttp/test_templates.py

@@ -1,3 +1,7 @@
+import sys
+
+import pytest
+
 from .app.web import set_filesystem_loader
 from .app.web import set_package_loader
 
@@ -43,6 +47,7 @@ async def test_template_rendering_filesystem(untraced_app_tracer, aiohttp_client
     assert 0 == span.error
 
 
+@pytest.mark.skipif(sys.version_info < (3, 6), reason="Not compatible with Python 3.5")
 async def test_template_rendering_package(untraced_app_tracer, aiohttp_client, loop):
     app, tracer = untraced_app_tracer
     client = await aiohttp_client(app)

tox.ini

@@ -22,11 +22,6 @@ envlist =
     {py27,py35,py36,py37,py38,py39,py310}-profile-minreqs{,-gevent}
     py{27,35,36,37,38,39,310}-integration-{v5,latest,snapshot}
 # Integrations environments
-    # Python 3.7 needs at least aiohttp 2.3
-    aiohttp_contrib-{py35,py36}-aiohttp{20,21,22}-aiohttp_jinja{012,013}-yarl-pytest3
-    aiohttp_contrib-{py35,py36,py37,py38}-aiohttp23-aiohttp_jinja015-yarl10-pytest3
-    aiohttp_contrib-{py35,py36,py37}-aiohttp{30,31,32,33,35,36}-aiohttp_jinja{015}-yarl10-pytest3
-    aiohttp_contrib-py{38,39}-aiohttp{30,31,32,33,36}-aiohttp_jinja015-yarl10-pytest3
     algoliasearch_contrib-py{27,35,36,37,38,39,310}-algoliasearch{1,2,}
     asyncio_contrib-py{35,36,37,38,39,310}
     bottle_contrib{,_autopatch}-py{27,35,36,37,38,39}-bottle{11,12,}-webtest
@@ -117,28 +112,9 @@ deps =
     py39-profile-minreqs-gevent: greenlet==0.4.16
     py310-profile-minreqs-gevent: gevent==21.8.0
     py310-profile-minreqs-gevent: greenlet==1.1.0
-# force the downgrade as a workaround
-# https://github.com/aio-libs/aiohttp/issues/2662
-    yarl: yarl==0.18.0
-    yarl10: yarl>=1.0,<1.1
 # backports
     py27: enum34
 # integrations
-    aiohttp_contrib: pytest-aiohttp
-    aiohttp20: aiohttp>=2.0,<2.1
-    aiohttp21: aiohttp>=2.1,<2.2
-    aiohttp22: aiohttp>=2.2,<2.3
-    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
-    aiohttp_jinja012: aiohttp_jinja2>=0.12,<0.13
-    aiohttp_jinja013: aiohttp_jinja2>=0.13,<0.14
-    aiohttp_jinja015: aiohttp_jinja2>=0.15,<0.16
     algoliasearch: algoliasearch
     algoliasearch1: algoliasearch>=1.2,<2
     algoliasearch2: algoliasearch>=2,<3
@@ -279,7 +255,6 @@ commands =
     opentracer_gevent: pytest {posargs} tests/opentracer/test_tracer_gevent.py
     integration-{v5,latest,snapshot}: pytest --no-cov {posargs} tests/integration/
 # Contribs
-    aiohttp_contrib: pytest {posargs} tests/contrib/aiohttp
     algoliasearch_contrib: pytest {posargs} tests/contrib/algoliasearch
     asyncio_contrib: pytest {posargs} tests/contrib/asyncio
     bottle_contrib: pytest {posargs} --ignore="tests/contrib/bottle/test_autopatch.py" tests/contrib/bottle/