Merge branch 'master' into transaction-context-manager

Author: beniwohli

.ci/.jenkins_exclude.yml

@@ -1,4 +1,6 @@
 exclude:
+  - PYTHON_VERSION: pypy-3  # pypy3 currently fails on CI, e.g. https://apm-ci.elastic.co/blue/organizations/jenkins/apm-agent-python%2Fapm-agent-python-mbp/detail/PR-1099/2/pipeline#step-3497-log-1
+    FRAMEWORK: none
   # Flask
   - PYTHON_VERSION: pypy-3
     FRAMEWORK: flask-0.11 # see https://github.com/pallets/flask/commit/6e46d0cd, 0.11.2 was never released
@@ -128,6 +130,8 @@ exclude:
     FRAMEWORK: psycopg2-2.7
   - PYTHON_VERSION: python-3.10-rc # see https://github.com/psycopg/psycopg2/issues/858
     FRAMEWORK: psycopg2-2.7
+  - PYTHON_VERSION: pypy-3  # async keyword clash in old version of psycopg2cffi
+    FRAMEWORK: psycopg2-2.7
   # pyodbc
   - PYTHON_VERSION: pypy-3
     FRAMEWORK: pyodbc-newest
@@ -216,3 +220,16 @@ exclude:
     FRAMEWORK: asyncpg-newest
   - PYTHON_VERSION: python-3.10-rc  # https://github.com/MagicStack/asyncpg/issues/699
     FRAMEWORK: asyncpg-newest
+  - PYTHON_VERSION: pypy-3
+    FRAMEWORK: aioredis-newest
+  - PYTHON_VERSION: python-3.6
+    FRAMEWORK: aioredis-newest
+  - PYTHON_VERSION: python-3.10-rc  # getting "loop argument must agree with lock" error
+    FRAMEWORK: aioredis-newest
+  # aiomysql
+  - PYTHON_VERSION: pypy-3
+    FRAMEWORK: aiomysql-newest
+  - PYTHON_VERSION: python-3.6
+    FRAMEWORK: aiomysql-newest
+  - PYTHON_VERSION: python-3.10-rc  # getting "loop argument must agree with lock" error
+    FRAMEWORK: aiomysql-newest

.ci/.jenkins_framework.yml

@@ -8,6 +8,7 @@ FRAMEWORK:
   - django-3.2
   - flask-0.12
   - flask-1.1
+  - flask-2.0
   - opentracing-newest
   - twisted-18
   - celery-3-flask-1.0
@@ -18,6 +19,8 @@ FRAMEWORK:
   - boto3-newest
   - pymongo-newest
   - redis-newest
+  - aioredis-newest
+  #- aioredis-2  # not supported yet
   - psycopg2-newest
   - pymssql-newest
   - pyodbc-newest
@@ -44,3 +47,4 @@ FRAMEWORK:
   - httpx-newest
   - httplib2-newest
   - prometheus_client-newest
+  - aiomysql-newest

.ci/.jenkins_framework_full.yml

@@ -15,6 +15,7 @@ FRAMEWORK:
   - flask-0.12
   - flask-1.0
   - flask-1.1
+  - flask-2.0
   - celery-3-flask-1.0
   - celery-3-django-1.11
   - celery-3-django-2.0
@@ -40,8 +41,8 @@ FRAMEWORK:
   - pymongo-3.4
   - pymongo-3.5
   - pymongo-newest
-  - redis-2.8
-  - redis-2.9
+  - redis-3
+  - redis-2
   - redis-newest
   - psycopg2-2.7
   - psycopg2-newest
@@ -73,7 +74,6 @@ FRAMEWORK:
   - pymemcache-3.0
   - pymemcache-newest
   - graphene-2
-  - httpx-0.12
   - httpx-0.13
   - httpx-0.14
   - httpx-newest

.ci/.jenkins_windows.yml

@@ -6,15 +6,15 @@
 #
 
 windows:
-  - VERSION: "3.6"
-    WEBFRAMEWORK: "none"
-    ASYNCIO: "true"
+#  - VERSION: "3.6"
+#    WEBFRAMEWORK: "none"
+#    ASYNCIO: "true"
   - VERSION: "3.7"
     WEBFRAMEWORK: "none"
     ASYNCIO: "true"
   - VERSION: "3.8"
     WEBFRAMEWORK: "none"
     ASYNCIO: "true"
-#  - VERSION: "3.9"  # waiting for greenlet to have binary wheels for 3.9
-#    WEBFRAMEWORK: "none"
-#    ASYNCIO: "true"
+  - VERSION: "3.9"  # waiting for greenlet to have binary wheels for 3.9
+    WEBFRAMEWORK: "none"
+    ASYNCIO: "true"