Merge branch 'main' into wsgi-dict-deprecation

Author: mergify[bot]

tox.ini

@@ -61,12 +61,14 @@ envlist =
     mongodb8-datastore_motor-{py37,py38,py39,py310,py311,py312,py313}-motorlatest,
     mongodb3-datastore_pymongo-{py37,py38,py39,py310,py311,py312}-pymongo03,
     mongodb8-datastore_pymongo-{py37,py38,py39,py310,py311,py312,py313,pypy310}-pymongo04,
-    mysql-datastore_aiomysql-{py37,py38,py39,py310,py311,py312,py313,pypy310},
+    ; aiomysql tests on PyPy disabled for now due to issues building cryptography
+    mysql-datastore_aiomysql-{py37,py38,py39,py310,py311,py312,py313},
     mssql-datastore_pymssql-pymssqllatest-{py39,py310,py311,py312,py313},
     mssql-datastore_pymssql-pymssql020301-{py37,py38},
     mysql-datastore_mysql-mysqllatest-{py37,py38,py39,py310,py311,py312,py313},
     mysql-datastore_mysqldb-{py38,py39,py310,py311,py312,py313},
-    mysql-datastore_pymysql-{py37,py38,py39,py310,py311,py312,py313,pypy310},
+    ; pymysql tests on PyPy disabled for now due to issues building cryptography
+    mysql-datastore_pymysql-{py37,py38,py39,py310,py311,py312,py313},
     oracledb-datastore_oracledb-{py39,py310,py311,py312,py313}-oracledblatest,
     oracledb-datastore_oracledb-{py39,py313}-oracledb02,
     oracledb-datastore_oracledb-{py39,py312}-oracledb01,