From 7525854beda2c0c0303b265c97b52c994561221c Mon Sep 17 00:00:00 2001 From: v-mingzhehan Date: Tue, 22 Jun 2021 03:47:39 +0000 Subject: [PATCH 1/2] Add shortcut in init --- qlib/backtest/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qlib/backtest/__init__.py b/qlib/backtest/__init__.py index 91eedd736..edfc907cd 100644 --- a/qlib/backtest/__init__.py +++ b/qlib/backtest/__init__.py @@ -8,7 +8,7 @@ from .backtest import backtest_loop from .backtest import collect_data_loop from .order import Order -from .utils import CommonInfrastructure +from .utils import CommonInfrastructure, TradeCalendarManager from ..strategy.base import BaseStrategy from ..utils import init_instance_by_config from ..log import get_module_logger From 583fbbef3ce714bdc4b3130b74620f79873119bb Mon Sep 17 00:00:00 2001 From: v-mingzhehan Date: Tue, 22 Jun 2021 07:07:19 +0000 Subject: [PATCH 2/2] Resolve init conflict --- qlib/backtest/__init__.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/qlib/backtest/__init__.py b/qlib/backtest/__init__.py index 107f97782..ae07cdbdf 100644 --- a/qlib/backtest/__init__.py +++ b/qlib/backtest/__init__.py @@ -7,15 +7,9 @@ from .exchange import Exchange from .executor import BaseExecutor from .backtest import backtest_loop from .backtest import collect_data_loop -<<<<<<< HEAD from .order import Order from .utils import CommonInfrastructure, TradeCalendarManager -======= -from .utils import CommonInfrastructure -from .order import Order - ->>>>>>> ab97e8248443789ce1e0f90a9b5596e5fee60566 from ..strategy.base import BaseStrategy from ..utils import init_instance_by_config from ..log import get_module_logger