diff --git a/catalyst/exchange/bittrex/bittrex.py b/catalyst/exchange/bittrex/bittrex.py index 6c490a46..d50d9bb8 100644 --- a/catalyst/exchange/bittrex/bittrex.py +++ b/catalyst/exchange/bittrex/bittrex.py @@ -1,7 +1,7 @@ import json +import time import pandas as pd -import time from catalyst.assets._assets import TradingPair from logbook import Logger from six.moves import urllib diff --git a/catalyst/exchange/exchange_bundle.py b/catalyst/exchange/exchange_bundle.py index d25b26ec..dee45f6c 100644 --- a/catalyst/exchange/exchange_bundle.py +++ b/catalyst/exchange/exchange_bundle.py @@ -1,4 +1,30 @@ import os +import shutil +from itertools import chain + +import pandas as pd +from catalyst.assets._assets import TradingPair +from logbook import Logger +from pandas.tslib import Timestamp +from pytz import UTC +from six import itervalues + +from catalyst import get_calendar +from catalyst.constants import LOG_LEVEL +from catalyst.data.minute_bars import BcolzMinuteOverlappingData, \ + BcolzMinuteBarMetadata +from catalyst.exchange.bundle_utils import range_in_bundle, \ + get_bcolz_chunk, get_delta, get_month_start_end, \ + get_year_start_end, get_df_from_arrays, get_start_dt, get_period_label +from catalyst.exchange.exchange_bcolz import BcolzExchangeBarReader, \ + BcolzExchangeBarWriter +from catalyst.exchange.exchange_errors import EmptyValuesInBundleError, \ + TempBundleNotFoundError, \ + NoDataAvailableOnExchange, \ + PricingDataNotLoadedError +from catalyst.exchange.exchange_utils import get_exchange_folder +from catalyst.utils.cli import maybe_show_progress +from catalyst.utils.paths import ensure_directory import os import shutil from itertools import chain diff --git a/catalyst/exchange/poloniex/poloniex.py b/catalyst/exchange/poloniex/poloniex.py index 65c397c7..62845845 100644 --- a/catalyst/exchange/poloniex/poloniex.py +++ b/catalyst/exchange/poloniex/poloniex.py @@ -1,4 +1,3 @@ -import calendar import json import json import time diff --git a/tests/exchange/test_bundle.py b/tests/exchange/test_bundle.py index 6cdd45ca..5d347036 100644 --- a/tests/exchange/test_bundle.py +++ b/tests/exchange/test_bundle.py @@ -1,14 +1,13 @@ import hashlib +import os import tempfile from logging import getLogger -import os import pandas as pd from catalyst import get_calendar from catalyst.exchange.bundle_utils import get_bcolz_chunk, \ - get_periods_range, get_start_dt, get_month_start_end, get_df_from_arrays, \ - get_year_start_end + get_start_dt, get_df_from_arrays from catalyst.exchange.exchange_bcolz import BcolzExchangeBarReader, \ BcolzExchangeBarWriter from catalyst.exchange.exchange_bundle import ExchangeBundle, \