From ae39f6fba510bf1d285433e18a91b75ecd996dc2 Mon Sep 17 00:00:00 2001 From: hroff-1902 Date: Fri, 9 Aug 2019 14:48:57 +0300 Subject: [PATCH] use of termcolor eliminated --- freqtrade/optimize/hyperopt.py | 11 ++++++----- requirements-common.txt | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/freqtrade/optimize/hyperopt.py b/freqtrade/optimize/hyperopt.py index fc0fb56b2..802c848f1 100644 --- a/freqtrade/optimize/hyperopt.py +++ b/freqtrade/optimize/hyperopt.py @@ -14,11 +14,11 @@ from pprint import pprint from typing import Any, Dict, List, Optional from colorama import init as colorama_init +from colorama import Fore, Style from joblib import Parallel, delayed, dump, load, wrap_non_picklable_objects, cpu_count from pandas import DataFrame from skopt import Optimizer from skopt.space import Dimension -from termcolor import colored from freqtrade.configuration import Arguments from freqtrade.data.history import load_data, get_timeframe @@ -163,11 +163,11 @@ class Hyperopt(Backtesting): # Colorize output if self.config.get('print_colorized', False): if results['total_profit'] > 0: - log_str = colored(log_str, attrs=['bold']) + log_str = Style.BRIGHT + log_str if results['loss'] >= MAX_LOSS: - log_str = colored(log_str, 'red') + log_str = Fore.RED + log_str elif is_best_loss: - log_str = colored(log_str, 'green') + log_str = Fore.GREEN + log_str if print_all: print(log_str) else: @@ -355,7 +355,8 @@ class Hyperopt(Backtesting): opt = self.get_optimizer(config_jobs) - colorama_init() + if self.config.get('print_colorized', False): + colorama_init(autoreset=True) try: with Parallel(n_jobs=config_jobs) as parallel: diff --git a/requirements-common.txt b/requirements-common.txt index b0c4c6729..9b62cae5c 100644 --- a/requirements-common.txt +++ b/requirements-common.txt @@ -32,5 +32,4 @@ sdnotify==0.3.2 flask==1.1.1 # Support for colorized terminal output -termcolor==1.1.0 colorama==0.4.1