Skip to content

Commit 0bd807c

Browse files
nashifdkalowsk
authored andcommitted
Revert "twister: Colorize console log output"
This reverts commit 90555a1. This causing issues with CI due to missing colorlog module when PRs are based on old state of main. Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent 5b85e9d commit 0bd807c

4 files changed

Lines changed: 2 additions & 16 deletions

File tree

scripts/pylib/twister/twisterlib/log_helper.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import platform
1111
import shlex
1212

13-
from colorlog import ColoredFormatter
14-
1513
_WINDOWS = platform.system() == 'Windows'
1614

1715

@@ -34,7 +32,6 @@ def log_command(logger, msg, args):
3432
else:
3533
logger.debug(msg, shlex.join(args))
3634

37-
3835
def setup_logging(outdir, log_file, log_level, timestamps):
3936
logger = logging.getLogger("twister")
4037
logger.setLevel(logging.DEBUG)
@@ -53,11 +50,9 @@ def setup_logging(outdir, log_file, log_level, timestamps):
5350

5451
# create formatter and add it to the handlers
5552
if timestamps:
56-
formatter = ColoredFormatter(
57-
"%(asctime)s - %(log_color)s%(levelname)s%(reset)s - %(message)s"
58-
)
53+
formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
5954
else:
60-
formatter = ColoredFormatter("%(log_color)s%(levelname)-7s%(reset)s - %(message)s")
55+
formatter = logging.Formatter("%(levelname)-7s - %(message)s")
6156

6257
formatter_file = logging.Formatter(
6358
"%(asctime)s - %(name)s - %(levelname)s - %(message)s"

scripts/requirements-actions.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ anytree
33
awscli
44
canopen
55
clang-format>=15.0.0
6-
colorlog
76
elasticsearch<9
87
exceptiongroup>=1.0.0rc8
98
gcovr==6.0

scripts/requirements-actions.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,18 +338,13 @@ colorama==0.4.6 \
338338
# via
339339
# awscli
340340
# click
341-
# colorlog
342341
# halo
343342
# log-symbols
344343
# pylint
345344
# pytest
346345
# tox
347346
# tqdm
348347
# west
349-
colorlog==6.10.1 \
350-
--hash=sha256:2d7e8348291948af66122cff006c9f8da6255d224e7cf8e37d8de2df3bad8c9c \
351-
--hash=sha256:eb4ae5cb65fe7fec7773c2306061a8e63e02efc2c72eba9d27b0fa23c94f1321
352-
# via -r requirements-actions.in
353348
cryptography==49.0.0 \
354349
--hash=sha256:026ac7423e6fa66872d3bf889be5974507da3944f866f704fa200eadacd00001 \
355350
--hash=sha256:07cab27cc7b7e0fd28e5e26bb9eeedde5c135c868b46de4a27845abe94af6122 \

scripts/requirements-base.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ pyelftools>=0.29
1010
# twister to parse YAMLs, by west, zephyr_module,...
1111
PyYAML>=6.0
1212

13-
# used by twister
14-
colorlog
15-
1613
# YAML validation. Used by zephyr_module.
1714
pykwalify
1815
jsonschema

0 commit comments

Comments
 (0)