]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
add color directives
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 11 Dec 2022 20:47:25 +0000 (15:47 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 11 Dec 2022 22:25:18 +0000 (17:25 -0500)
See https://tox.wiki/en/latest/faq.html#tox-4-known-regressions

Change-Id: I3c7291a660dc167bce3151e02cd123edc4707ca1
(cherry picked from commit 184508afbb7656c4f51d98695bbeeeec9aae9b87)

tox.ini

diff --git a/tox.ini b/tox.ini
index f9727286590961a4a871a044a915831861c291cb..f007614b3b7fc91e83ed85e7ac933c04808bec33 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -73,8 +73,11 @@ allowlist_externals=sh, /bin/true
 setenv=
     PYTHONPATH=
     PYTHONNOUSERSITE=1
+
+    PYTEST_COLOR={tty:--color=yes}
+
     MEMUSAGE=--nomemory
-    BASECOMMAND=python -m pytest --rootdir {toxinidir} --log-info=sqlalchemy.testing
+    BASECOMMAND=python -m pytest {env:PYTEST_COLOR} --rootdir {toxinidir} --log-info=sqlalchemy.testing
 
     WORKERS={env:TOX_WORKERS:-n4  --max-worker-restart=5}
 
@@ -156,7 +159,7 @@ deps=
      patch==1.*
      git+https://github.com/sqlalchemy/sqlalchemy2-stubs
 commands =
-    pytest test/ext/mypy/test_mypy_plugin_py3k.py {posargs}
+    pytest {env:PYTEST_COLOR} test/ext/mypy/test_mypy_plugin_py3k.py {posargs}
 
 # thanks to https://julien.danjou.info/the-best-flake8-extensions/
 [testenv:pep8]
@@ -183,7 +186,7 @@ commands =
 deps = {[testenv]deps}
        .[aiosqlite]
 commands=
-  python -m pytest {env:PY_SPECIFIC} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
+  python -m pytest {env:PYTEST_COLOR} {env:PY_SPECIFIC} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
   oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt
 
 # command run in the github action when cext are not active.
@@ -191,5 +194,5 @@ commands=
 deps = {[testenv]deps}
        .[aiosqlite]
 commands=
-  python -m pytest {env:PY_SPECIFIC} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
+  python -m pytest {env:PYTEST_COLOR} {env:PY_SPECIFIC} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
   oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt