]> 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 20:47:25 +0000 (15:47 -0500)
See https://tox.wiki/en/latest/faq.html#tox-4-known-regressions

Change-Id: I3c7291a660dc167bce3151e02cd123edc4707ca1

tox.ini

diff --git a/tox.ini b/tox.ini
index 444583c19804bf9835004765d094b25bef8184ac..0260dad0dc733c6839a57b05da8ac27f861afb87 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -73,7 +73,10 @@ setenv=
     PYTHONNOUSERSITE=1
     PYTEST_EXCLUDES=-m "not memory_intensive and not mypy"
 
-    BASECOMMAND=python -m pytest --rootdir {toxinidir} --log-info=sqlalchemy.testing
+    PYTEST_COLOR={tty:--color=yes}
+    MYPY_COLOR={tty:--color-output}
+
+    BASECOMMAND=python -m pytest {env:PYTEST_COLOR} --rootdir {toxinidir} --log-info=sqlalchemy.testing
 
     WORKERS={env:TOX_WORKERS:-n4  --max-worker-restart=5}
 
@@ -148,7 +151,7 @@ deps=
      importlib_metadata; python_version < '3.8'
      mypy >= 0.981
 commands =
-    mypy  ./lib/sqlalchemy
+    mypy  {env:MYPY_COLOR} ./lib/sqlalchemy
     # pyright changes too often with not-exactly-correct errors
     # suddently appearing for it to be stable enough for CI
     # pyright
@@ -163,7 +166,7 @@ deps=
      patch==1.*
 
 commands =
-    pytest -m mypy {posargs}
+    pytest {env:PYTEST_COLOR} -m mypy {posargs}
 
 [testenv:mypy-cov]
 
@@ -172,7 +175,7 @@ deps=
      pytest-cov
 
 commands =
-    pytest -m mypy {env:COVERAGE} {posargs}
+    pytest {env:PYTEST_COLOR} -m mypy {env:COVERAGE} {posargs}
 
 setenv=
     COVERAGE={[testenv]cov_args}
@@ -230,7 +233,7 @@ commands = {[testenv:lint]commands}
 deps = {[testenv]deps}
        .[aiosqlite]
 commands=
-  python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:IDENTS:} {env:PYTEST_EXCLUDES:} {env:COVERAGE:} {posargs}
+  python -m pytest {env:PYTEST_COLOR} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:IDENTS:} {env:PYTEST_EXCLUDES:} {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.
@@ -238,5 +241,5 @@ commands=
 deps = {[testenv]deps}
        .[aiosqlite]
 commands=
-  python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:IDENTS:} {env:PYTEST_EXCLUDES:} {env:COVERAGE:} {posargs}
+  python -m pytest {env:PYTEST_COLOR} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:IDENTS:} {env:PYTEST_EXCLUDES:} {env:COVERAGE:} {posargs}
   oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt