Fix base branch

.github/actions/setup-python-matrix/action.yml

@@ -8,6 +8,11 @@ runs:
         python-version: "pypy-3.7"
         architecture: x64
 
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "pypy-3.8"
+        architecture: x64
+
     # - uses: actions/setup-python@v4
     #   with:
     #     python-version: "pypy-2.7"

.github/containers/Dockerfile

@@ -79,7 +79,7 @@ RUN echo 'eval "$(pyenv init -)"' >>$HOME/.bashrc && \
     pyenv update
 
 # Install Python
-ARG PYTHON_VERSIONS="3.10 3.9 3.8 3.7 3.11 2.7 pypy2.7-7.3.11 pypy3.7"
+ARG PYTHON_VERSIONS="3.10 3.9 3.8 3.7 3.11 2.7 pypy2.7-7.3.11 pypy3.8"
 COPY --chown=1000:1000 --chmod=+x ./install-python.sh /tmp/install-python.sh
 COPY ./requirements.txt /requirements.txt
 RUN /tmp/install-python.sh && \

tox.ini

@@ -92,10 +92,10 @@ envlist =
     mssql-datastore_pymssql-{py37,py38,py39,py310,py311},
     mysql-datastore_pymysql-{py27,py37,py38,py39,py310,py311,pypy27,pypy37},
     solr-datastore_pysolr-{py27,py37,py38,py39,py310,py311,pypy27,pypy37},
-    redis-datastore_redis-{py27,py37,py38,pypy27,pypy37}-redis03,
-    redis-datastore_redis-{py37,py38,py39,py310,py311,pypy37}-redis{0400,latest},
-    redis-datastore_aioredis-{py37,py38,py39,py310,pypy37}-aioredislatest,
-    redis-datastore_aioredis-{py37,py38,py39,py310,py311,pypy37}-redislatest,
+    redis-datastore_redis-{py27,py37,py38,pypy27,pypy38}-redis03,
+    redis-datastore_redis-{py37,py38,py39,py310,py311,pypy38}-redis{0400,latest},
+    redis-datastore_aioredis-{py37,py38,py39,py310,pypy38}-aioredislatest,
+    redis-datastore_aioredis-{py37,py38,py39,py310,py311,pypy38}-redislatest,
     redis-datastore_aredis-{py37,py38,py39,pypy37}-aredislatest,
     solr-datastore_solrpy-{py27,pypy27}-solrpy{00,01},
     python-datastore_sqlite-{py27,py37,py38,py39,py310,py311,pypy27,pypy37},
@@ -111,7 +111,7 @@ envlist =
     python-external_requests-{py27,py37,py38,py39,py310,py311,pypy27,pypy37},
     python-external_urllib3-{py27,py37,pypy27}-urllib3{0109},
     python-external_urllib3-{py27,py37,py38,py39,py310,py311,pypy27,pypy37}-urllib3latest,
-    python-framework_aiohttp-{py37,py38,py39,py310,py311,pypy37}-aiohttp03,
+    python-framework_aiohttp-{py37,py38,py39,py310,py311,pypy38}-aiohttp03,
     python-framework_ariadne-{py37,py38,py39,py310,py311}-ariadnelatest,
     python-framework_ariadne-py37-ariadne{0011,0012,0013},
     python-framework_bottle-py27-bottle{0008,0009,0010},
@@ -136,8 +136,8 @@ envlist =
     python-framework_graphene-{py37,py38,py39,py310,py311}-graphenelatest,
     python-framework_graphene-{py27,py37,py38,py39,pypy27,pypy37}-graphene{0200,0201},
     python-framework_graphene-{py310,py311}-graphene0201,
-    python-framework_graphql-{py27,py37,py38,py39,py310,py311,pypy27,pypy37}-graphql02,
-    python-framework_graphql-{py37,py38,py39,py310,py311,pypy37}-graphql03,
+    python-framework_graphql-{py27,py37,py38,py39,py310,py311,pypy27,pypy38}-graphql02,
+    python-framework_graphql-{py37,py38,py39,py310,py311,pypy38}-graphql03,
     ; temporarily disabling graphqlmaster tests
     python-framework_graphql-py37-graphql{0202,0203,0300,0301,0302},
     grpc-framework_grpc-py27-grpc0125,
@@ -170,7 +170,7 @@ envlist =
 [testenv]
 deps =
     # Base Dependencies
-    {py37,py38,py39,py310,py311,pypy37}: pytest==7.2.2
+    {py37,py38,py39,py310,py311,pypy37,pypy38}: pytest==7.2.2
     {py27,pypy27}: pytest==4.6.11
     iniconfig
     coverage
@@ -277,6 +277,7 @@ deps =
     external_urllib3-urllib30109: urllib3<1.10
     external_urllib3-urllib3latest: urllib3
     framework_aiohttp-aiohttp03: aiohttp
+    framework_aiohttp-aiohttp03: mypy_extensions
     framework_ariadne-ariadnelatest: ariadne
     framework_ariadne-ariadne0011: ariadne<0.12
     framework_ariadne-ariadne0012: ariadne<0.13