From 237211139f5989444effa3fff7b62dcad7f2fb43 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 15 Oct 2021 11:47:08 -0400
Subject: [PATCH] re-enable asnycmy >= 0.2.3; disable aiomysql totally

Change-Id: I94bc22db0462509003c8241d0ccef915fe6513c6
---
 lib/sqlalchemy/dialects/mysql/aiomysql.py | 9 ++++++---
 setup.cfg                                 | 2 +-
 tox.ini                                   | 5 +----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/sqlalchemy/dialects/mysql/aiomysql.py b/lib/sqlalchemy/dialects/mysql/aiomysql.py
index c5ba635c24..93d2360580 100644
--- a/lib/sqlalchemy/dialects/mysql/aiomysql.py
+++ b/lib/sqlalchemy/dialects/mysql/aiomysql.py
@@ -11,9 +11,12 @@ r"""
     :connectstring: mysql+aiomysql://user:password@host:port/dbname[?key=value&key=value...]
     :url: https://github.com/aio-libs/aiomysql
 
-.. warning:: The aiomysql dialect as of September, 2021 appears to be unmaintained
-   and no longer functions for Python version 3.10.   Please refer to the
-   :ref:`asyncmy` dialect for current MySQL/MariaDD asyncio functionality.
+.. warning:: The aiomysql dialect is not currently tested as part of
+   SQLAlchemy’s continuous integration. As of September, 2021 the driver
+   appears to be unmaintained and no longer functions for Python version 3.10,
+   and additionally depends on a significantly outdated version of PyMySQL.
+   Please refer to the :ref:`asyncmy` dialect for current MySQL/MariaDB asyncio
+   functionality.
 
 The aiomysql dialect is SQLAlchemy's second Python asyncio dialect.
 
diff --git a/setup.cfg b/setup.cfg
index 84bda4e255..7df0ad5c85 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -77,7 +77,7 @@ aiomysql =
     aiomysql;python_version>="3"
 asyncmy =
     %(asyncio)s
-    asyncmy>=0.2.0,!=0.2.1,!=0.2.2;python_version>="3"
+    asyncmy>=0.2.3;python_version>="3"
 aiosqlite =
     %(asyncio)s
     aiosqlite;python_version>="3"
diff --git a/tox.ini b/tox.ini
index 8e1b343a4d..d8ba67a440 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,6 @@ deps=
 
      mysql: .[mysql]
      mysql: .[pymysql]
-     mysql: git+https://github.com/sqlalchemy/aiomysql@sqlalchemy_tox; python_version >= '3'
      mysql: .[asyncmy]; python_version >= '3'
      mysql: .[mariadb_connector]; python_version >= '3'
 
@@ -103,9 +102,7 @@ setenv=
     py2{,7}-mysql: MYSQL={env:TOX_MYSQL_PY2K:{env:TOX_MYSQL:--db mysql}}
     mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql}
 
-    py3{,5,6,7,8,9}-mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql --dbdriver mariadbconnector --dbdriver aiomysql}
-    # omit aiomysql for Python 3.10
-    py3{,10,11}-mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql --dbdriver mariadbconnector }
+    py3-mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql --dbdriver mariadbconnector --dbdriver asyncmy}
 
 
     mssql: MSSQL={env:TOX_MSSQL:--db mssql}
-- 
2.47.3