summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2021-10-15 11:47:08 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2021-10-15 17:40:19 -0400
commit237211139f5989444effa3fff7b62dcad7f2fb43 (patch)
tree3532dabd67ba9bc5642269deb5a26ec2a7cf0e53
parent165bc7529d858a8cd6c7daa409d091f7c728c20f (diff)
downloadsqlalchemy-237211139f5989444effa3fff7b62dcad7f2fb43.tar.gz
re-enable asnycmy >= 0.2.3; disable aiomysql totally
Change-Id: I94bc22db0462509003c8241d0ccef915fe6513c6
-rw-r--r--lib/sqlalchemy/dialects/mysql/aiomysql.py9
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini5
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/aiomysql.py b/lib/sqlalchemy/dialects/mysql/aiomysql.py
index c5ba635c2..93d236058 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 84bda4e25..7df0ad5c8 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 8e1b343a4..d8ba67a44 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}