Merge "Accommodate SQLAlchemy 1.4/2.0"

diff --cc tox.ini
index 0b41cc8596e4f9342a077aca9a6f912d0aed3377,a33263595ccd987d52a66451a9bc631ea9e2d01a..fd1ce31014d3870bbca2a10b8b3ff18e4c66330b
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -10,12 -10,11 +10,12 @@@ cov_args=--cov=alembic --cov-report ter
  deps=pytest>4.6
       pytest-xdist
       mock
-      sqla13: {[tox]SQLA_REPO}@rel_1_3
-      sqlamaster: {[tox]SQLA_REPO}@master
+      sqla13: {[tox]SQLA_REPO}@rel_1_3#egg=sqlalchemy
+      sqlamaster: {[tox]SQLA_REPO}@master#egg=sqlalchemy
       postgresql: psycopg2
       mysql: mysqlclient
 -     mysql: pymysql
 +     mysql: pymysql;python_version>="3"
 +     mysql: pymysql<1;python_version<"3"
       oracle: cx_oracle>=7,<8;python_version<"3"
       oracle: cx_oracle>=7;python_version>="3"
       mssql: pymssql