From: Mike Bayer Date: Tue, 6 Dec 2022 02:04:21 +0000 (-0500) Subject: repair memusage tox under python 2 X-Git-Tag: rel_1_4_45~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b261e8a8b58d6c13fa1e4d544bffd06fbcf0c55;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git repair memusage tox under python 2 memusage was inadvertently blocked under py2k. also add path to test files as old pytest 4 versions are extremely slow collecting tests on py2. Change-Id: Ida74b6ef7f3c29d03201e27876cce56c517f3b05 --- diff --git a/tox.ini b/tox.ini index 87105998e5..923c2cf372 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,7 @@ setenv= cext: REQUIRE_SQLALCHEMY_CEXT=1 cov: COVERAGE={[testenv]cov_args} backendonly: BACKENDONLY=--backend-only - memusage: MEMUSAGE='-k test_memusage' + memusage: MEMUSAGE=-k test_memusage test/aaa_profiling/ oracle: WORKERS={env:TOX_WORKERS:-n2 --max-worker-restart=5} oracle: ORACLE={env:TOX_ORACLE:--db oracle} @@ -105,6 +105,8 @@ setenv= py3{,5,6,7,8,9}: PY_SPECIFIC=--exclude-tag memory-intensive --exclude-tag timing-intensive py2{,7}: PY_SPECIFIC=--exclude-tag memory-intensive --exclude-tag timing-intensive + memusage: PY_SPECIFIC= + mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql} # py3{,7,8,9,10,11}-mysql: EXTRA_MYSQL_DRIVERS={env:EXTRA_MYSQL_DRIVERS:--dbdriver mysqldb --dbdriver pymysql --dbdriver mariadbconnector --dbdriver asyncmy}