From da9c3e7d7d6b2271e3c16503e26f8b2ab6ef6119 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sun, 29 Oct 2017 09:36:03 +0200 Subject: [PATCH] remove leftover dates from removing date filtering --- freqtrade/analyze.py | 4 ++-- freqtrade/tests/test_analyze.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/freqtrade/analyze.py b/freqtrade/analyze.py index 3b9a870c3..7151208d9 100644 --- a/freqtrade/analyze.py +++ b/freqtrade/analyze.py @@ -15,7 +15,7 @@ logging.basicConfig(level=logging.DEBUG, logger = logging.getLogger(__name__) -def parse_ticker_dataframe(ticker: list, minimum_date: arrow.Arrow) -> DataFrame: +def parse_ticker_dataframe(ticker: list) -> DataFrame: """ Analyses the trend for the given pair :param pair: pair as str in format BTC_ETH or BTC-ETH @@ -73,7 +73,7 @@ def analyze_ticker(pair: str) -> DataFrame: """ minimum_date = arrow.utcnow().shift(hours=-24) data = get_ticker_history(pair, minimum_date) - dataframe = parse_ticker_dataframe(data['result'], minimum_date) + dataframe = parse_ticker_dataframe(data['result']) if dataframe.empty: logger.warning('Empty dataframe for pair %s', pair) diff --git a/freqtrade/tests/test_analyze.py b/freqtrade/tests/test_analyze.py index d063de775..0c363e4a3 100644 --- a/freqtrade/tests/test_analyze.py +++ b/freqtrade/tests/test_analyze.py @@ -1,7 +1,7 @@ # pragma pylint: disable=missing-docstring +from datetime import datetime import json import pytest -import arrow from pandas import DataFrame from freqtrade.analyze import parse_ticker_dataframe, populate_buy_trend, populate_indicators, \ @@ -12,7 +12,7 @@ def result(): with open('freqtrade/tests/testdata/btc-eth.json') as data_file: data = json.load(data_file) - return parse_ticker_dataframe(data['result'], arrow.get('2017-08-30T10:00:00')) + return parse_ticker_dataframe(data['result']) def test_dataframe_has_correct_columns(result): assert result.columns.tolist() == \ @@ -27,10 +27,10 @@ def test_populates_buy_trend(result): assert 'buy_price' in dataframe.columns def test_returns_latest_buy_signal(mocker): - buydf = DataFrame([{'buy': 1, 'date': arrow.utcnow()}]) + buydf = DataFrame([{'buy': 1, 'date': datetime.today()}]) mocker.patch('freqtrade.analyze.analyze_ticker', return_value=buydf) assert get_buy_signal('BTC-ETH') - buydf = DataFrame([{'buy': 0, 'date': arrow.utcnow()}]) + buydf = DataFrame([{'buy': 0, 'date': datetime.today()}]) mocker.patch('freqtrade.analyze.analyze_ticker', return_value=buydf) assert not get_buy_signal('BTC-ETH')