From 1aed7c71f6d9787aa0fbcb0f3d5a9e6f922ff1cc Mon Sep 17 00:00:00 2001 From: Frederic Fortier Date: Mon, 12 Feb 2018 12:46:09 -0500 Subject: [PATCH] working on trades collector --- catalyst/exchange/exchange.py | 2 ++ etc/requirements.txt | 2 +- tests/exchange/test_suites/test_suite_exchange.py | 7 +++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/catalyst/exchange/exchange.py b/catalyst/exchange/exchange.py index 84cac446..bab87d3c 100644 --- a/catalyst/exchange/exchange.py +++ b/catalyst/exchange/exchange.py @@ -5,6 +5,7 @@ from time import sleep import numpy as np import pandas as pd + from catalyst.constants import LOG_LEVEL from catalyst.data.data_portal import BASE_FIELDS from catalyst.exchange.exchange_bundle import ExchangeBundle @@ -20,6 +21,7 @@ from catalyst.exchange.utils.exchange_utils import get_exchange_symbols, \ resample_history_df, has_bundle from logbook import Logger + log = Logger('Exchange', level=LOG_LEVEL) diff --git a/etc/requirements.txt b/etc/requirements.txt index f014ed33..9f48e0e2 100644 --- a/etc/requirements.txt +++ b/etc/requirements.txt @@ -81,6 +81,6 @@ empyrical==0.2.1 tables==3.3.0 #Catalyst dependencies -ccxt==1.10.909 +ccxt==1.10.1069 boto3==1.4.8 redo==1.6 diff --git a/tests/exchange/test_suites/test_suite_exchange.py b/tests/exchange/test_suites/test_suite_exchange.py index ca4357a5..3015cf1e 100644 --- a/tests/exchange/test_suites/test_suite_exchange.py +++ b/tests/exchange/test_suites/test_suite_exchange.py @@ -5,17 +5,16 @@ from logging import Logger, WARNING from time import sleep import pandas as pd -from catalyst.assets._assets import TradingPair from logbook import TestHandler -from catalyst.exchange.exchange_errors import ExchangeRequestError +from catalyst.assets._assets import TradingPair from catalyst.exchange.exchange_execution import ExchangeLimitOrder from catalyst.exchange.utils.exchange_utils import get_exchange_folder +from catalyst.exchange.utils.factory import get_exchanges from catalyst.exchange.utils.test_utils import select_random_exchanges, \ - handle_exchange_error, select_random_assets + select_random_assets from catalyst.testing import ZiplineTestCase from catalyst.testing.fixtures import WithLogger -from exchange.utils.factory import get_exchanges log = Logger('TestSuiteExchange')