This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 7658c1867c8a0ef01de76c1d17a3a4ce090881c2 Author: Ash Berlin-Taylor <[email protected]> AuthorDate: Thu Jun 11 11:50:33 2020 +0100 Correctly restore colour in logs after format arg (#9222) The "\e[22m" escape sequence has been tested on Konsole, iTerm2 and Terminal.app (cherry picked from commit bfe1d6b1aafc757f821ceb077e6b882ff1363357) --- airflow/utils/log/colored_log.py | 13 ++++++++----- requirements/requirements-python2.7.txt | 2 +- requirements/requirements-python3.5.txt | 2 +- requirements/requirements-python3.6.txt | 2 +- requirements/requirements-python3.7.txt | 2 +- requirements/setup-2.7.md5 | 2 +- requirements/setup-3.5.md5 | 2 +- requirements/setup-3.6.md5 | 2 +- requirements/setup-3.7.md5 | 2 +- setup.py | 1 - 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/airflow/utils/log/colored_log.py b/airflow/utils/log/colored_log.py index a89e779..8f92d80 100644 --- a/airflow/utils/log/colored_log.py +++ b/airflow/utils/log/colored_log.py @@ -23,9 +23,7 @@ import re import sys from colorlog import TTYColoredFormatter -from termcolor import colored - -ARGS = {"attrs": ["bold"]} +from colorlog.escape_codes import esc, escape_codes DEFAULT_COLORS = { "DEBUG": "red", @@ -35,6 +33,9 @@ DEFAULT_COLORS = { "CRITICAL": "red", } +BOLD_ON = escape_codes['bold'] +BOLD_OFF = esc('22') + class CustomTTYColoredFormatter(TTYColoredFormatter): """ @@ -52,7 +53,7 @@ class CustomTTYColoredFormatter(TTYColoredFormatter): if isinstance(arg, (int, float)): # In case of %d or %f formatting return arg - return colored(str(arg), **ARGS) # type: ignore + return BOLD_ON + str(arg) + BOLD_OFF @staticmethod def _count_number_of_arguments_in_message(record): @@ -83,7 +84,9 @@ class CustomTTYColoredFormatter(TTYColoredFormatter): record.exc_text = self.formatException(record.exc_info) if record.exc_text: - record.exc_text = colored(record.exc_text, DEFAULT_COLORS["ERROR"]) + record.exc_text = self.color(self.log_colors, record.levelname) + \ + record.exc_text + escape_codes['reset'] + return record def format(self, record): diff --git a/requirements/requirements-python2.7.txt b/requirements/requirements-python2.7.txt index bcce040..6fbc2c0 100644 --- a/requirements/requirements-python2.7.txt +++ b/requirements/requirements-python2.7.txt @@ -77,7 +77,7 @@ cachetools==3.1.1 cassandra-driver==3.20.2 cattrs==0.9.2 celery==4.4.5 -certifi==2020.4.5.2 +certifi==2020.6.20 cffi==1.14.0 cfgv==2.0.1 cfn-lint==0.33.1 diff --git a/requirements/requirements-python3.5.txt b/requirements/requirements-python3.5.txt index 725fdd8..7bd9464 100644 --- a/requirements/requirements-python3.5.txt +++ b/requirements/requirements-python3.5.txt @@ -68,7 +68,7 @@ cachetools==4.1.0 cassandra-driver==3.20.2 cattrs==0.9.2 celery==4.4.5 -certifi==2020.4.5.2 +certifi==2020.6.20 cffi==1.14.0 cfgv==2.0.1 cfn-lint==0.33.1 diff --git a/requirements/requirements-python3.6.txt b/requirements/requirements-python3.6.txt index 18a1b61..a7cf3c4 100644 --- a/requirements/requirements-python3.6.txt +++ b/requirements/requirements-python3.6.txt @@ -70,7 +70,7 @@ cachetools==4.1.0 cassandra-driver==3.20.2 cattrs==0.9.2 celery==4.4.5 -certifi==2020.4.5.2 +certifi==2020.6.20 cffi==1.14.0 cfgv==3.1.0 cfn-lint==0.33.1 diff --git a/requirements/requirements-python3.7.txt b/requirements/requirements-python3.7.txt index ff1137f..3e29ecb 100644 --- a/requirements/requirements-python3.7.txt +++ b/requirements/requirements-python3.7.txt @@ -70,7 +70,7 @@ cachetools==4.1.0 cassandra-driver==3.20.2 cattrs==0.9.2 celery==4.4.5 -certifi==2020.4.5.2 +certifi==2020.6.20 cffi==1.14.0 cfgv==3.1.0 cfn-lint==0.33.1 diff --git a/requirements/setup-2.7.md5 b/requirements/setup-2.7.md5 index 87e77b8..5734329 100644 --- a/requirements/setup-2.7.md5 +++ b/requirements/setup-2.7.md5 @@ -1 +1 @@ -99a88ba9c37191240b3dd729aed29e4b /opt/airflow/setup.py +068295c74403ac4827ec95c6639154f8 /opt/airflow/setup.py diff --git a/requirements/setup-3.5.md5 b/requirements/setup-3.5.md5 index 87e77b8..5734329 100644 --- a/requirements/setup-3.5.md5 +++ b/requirements/setup-3.5.md5 @@ -1 +1 @@ -99a88ba9c37191240b3dd729aed29e4b /opt/airflow/setup.py +068295c74403ac4827ec95c6639154f8 /opt/airflow/setup.py diff --git a/requirements/setup-3.6.md5 b/requirements/setup-3.6.md5 index 87e77b8..5734329 100644 --- a/requirements/setup-3.6.md5 +++ b/requirements/setup-3.6.md5 @@ -1 +1 @@ -99a88ba9c37191240b3dd729aed29e4b /opt/airflow/setup.py +068295c74403ac4827ec95c6639154f8 /opt/airflow/setup.py diff --git a/requirements/setup-3.7.md5 b/requirements/setup-3.7.md5 index 87e77b8..5734329 100644 --- a/requirements/setup-3.7.md5 +++ b/requirements/setup-3.7.md5 @@ -1 +1 @@ -99a88ba9c37191240b3dd729aed29e4b /opt/airflow/setup.py +068295c74403ac4827ec95c6639154f8 /opt/airflow/setup.py diff --git a/setup.py b/setup.py index 9f05da9..61339e7 100644 --- a/setup.py +++ b/setup.py @@ -586,7 +586,6 @@ INSTALL_REQUIREMENTS = [ 'sqlalchemy_jsonfield~=0.9;python_version>="3.5"', 'tabulate>=0.7.5, <0.9', 'tenacity==4.12.0', - 'termcolor==1.1.0', 'thrift>=0.9.2', 'typing;python_version<"3.5"', 'typing-extensions>=3.7.4;python_version<"3.8"',
