Doc fix; use normal TOX_POSTGRESQL env now

Change-Id: Ie47a9e9377858641f2f8e038133be27dc9aacd64

diff --git a/doc/build/orm/extensions/asyncio.rst b/doc/build/orm/extensions/asyncio.rst
index 388dee949b67d918d6e904aeca960dc04d47cef8..f3012e5bcbafc83d20ad029bf084b8768e2787fc 100644 (file)
--- a/doc/build/orm/extensions/asyncio.rst
+++ b/doc/build/orm/extensions/asyncio.rst
@@ -218,7 +218,7 @@ attribute accesses within a separate function::
                     ]
                 )
 
-            session.run_sync(fetch_and_update_objects)
+            await session.run_sync(fetch_and_update_objects)
 
             await session.commit()
 

diff --git a/tox.ini b/tox.ini
index e3539ce6112b4703348aa1cc9e8a4696f234f411..f16d94eaa5c5bef45632666e6ebf4937e8058d06 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -58,7 +58,7 @@ setenv=
     cov: COVERAGE={[testenv]cov_args}
     sqlite: SQLITE={env:TOX_SQLITE:--db sqlite}
     sqlite_file: SQLITE={env:TOX_SQLITE_FILE:--db sqlite_file}
-    postgresql: POSTGRESQL={env:TOX_POSTGRESQL_W_ASYNCPG:--db postgresql}
+    postgresql: POSTGRESQL={env:TOX_POSTGRESQL:--db postgresql}
     mysql: MYSQL={env:TOX_MYSQL:--db mysql --db pymysql}
     oracle: ORACLE={env:TOX_ORACLE:--db oracle}
     mssql: MSSQL={env:TOX_MSSQL:--db mssql}
@@ -70,7 +70,7 @@ setenv=
 # tox as of 2.0 blocks all environment variables from the
 # outside, unless they are here (or in TOX_TESTENV_PASSENV,
 # wildcards OK).  Need at least these
-passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL_W_ASYNCPG TOX_MYSQL TOX_ORACLE TOX_MSSQL TOX_SQLITE TOX_SQLITE_FILE TOX_WORKERS
+passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL TOX_MYSQL TOX_ORACLE TOX_MSSQL TOX_SQLITE TOX_SQLITE_FILE TOX_WORKERS
 
 # for nocext, we rm *.so in lib in case we are doing usedevelop=True
 commands=