From ff80019212a5632c9dd01ef727648107636c32fa Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 27 Sep 2023 11:27:47 -0400 Subject: [PATCH] open up py312 for all DBAPIs this wont run under jenkins gerrit job but will hit for jenkins_main / jenkins_dbapi_main. will merge and then revert if main / github builds are really tanking Change-Id: I29e372ad14bd1005c12176db2d837ecd451c0922 --- tox.ini | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index ec31a0bff0..b131b3f401 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ extras= sqlite_file: aiosqlite sqlite_file: sqlcipher; python_version < '3.10' postgresql: postgresql - py{3,37,38,39,310,311}-postgresql: postgresql_asyncpg + postgresql: postgresql_asyncpg postgresql: postgresql_pg8000 postgresql: postgresql_psycopg @@ -29,8 +29,8 @@ extras= oracle: oracle oracle: oracle_oracledb - py{3,37,38,39,310,311}-mssql: mssql - py{3,37,38,39,310,311}-mssql: mssql_pymssql + mssql: mssql + mssql: mssql_pymssql install_command= # TODO: I can find no way to get pip / tox / anyone to have this @@ -112,17 +112,16 @@ setenv= sqlite: SQLITE={env:TOX_SQLITE:--db sqlite} sqlite_file: SQLITE={env:TOX_SQLITE_FILE:--db sqlite_file} - py{3,37,38,39,310,311}-sqlite: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver pysqlite_numeric --dbdriver aiosqlite} + sqlite: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver pysqlite_numeric --dbdriver aiosqlite} py{37,38,39}-sqlite_file: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver aiosqlite --dbdriver pysqlcipher} # omit pysqlcipher for Python 3.10 - py{3,310,311}-sqlite_file: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver aiosqlite} + py{3,310,311,312}-sqlite_file: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver aiosqlite} postgresql: POSTGRESQL={env:TOX_POSTGRESQL:--db postgresql} - py{3,37,38,39,310,311}-postgresql: EXTRA_PG_DRIVERS={env:EXTRA_PG_DRIVERS:--dbdriver psycopg2 --dbdriver asyncpg --dbdriver pg8000 --dbdriver psycopg --dbdriver psycopg_async} - py312-postgresql: EXTRA_PG_DRIVERS={env:EXTRA_PG_DRIVERS:--dbdriver psycopg2 --dbdriver pg8000 --dbdriver psycopg --dbdriver psycopg_async} + postgresql: EXTRA_PG_DRIVERS={env:EXTRA_PG_DRIVERS:--dbdriver psycopg2 --dbdriver asyncpg --dbdriver pg8000 --dbdriver psycopg --dbdriver psycopg_async} # limit driver list for memusage target memusage: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite} @@ -133,10 +132,10 @@ setenv= mysql: MYSQL={env:TOX_MYSQL:--db mysql} mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql} - py{3,37,38,39,310,311}-mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql --dbdriver asyncmy --dbdriver aiomysql} + mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql --dbdriver asyncmy --dbdriver aiomysql} mssql: MSSQL={env:TOX_MSSQL:--db mssql} - py{3,37,38,39,310,311}-mssql: EXTRA_MSSQL_DRIVERS={env:EXTRA_MSSQL_DRIVERS:--dbdriver pyodbc --dbdriver pymssql} + mssql: EXTRA_MSSQL_DRIVERS={env:EXTRA_MSSQL_DRIVERS:--dbdriver pyodbc --dbdriver pymssql} oracle,mssql,sqlite_file: IDENTS=--write-idents db_idents.txt -- 2.47.3