From c3cae5dfc4aa2a0c8ae66070fe6428648184acbe Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sun, 7 Jan 2018 14:32:01 +0200 Subject: [PATCH 1/2] have pip upgrade flake8 and coveralls --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a00c03330..be330dad4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: install: - ./install_ta-lib.sh - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH -- pip install flake8 coveralls +- pip install --upgrade flake8 coveralls - pip install -r requirements.txt - pip install -e . jobs: From 5be733a17458369ef93edc3a6c080efe47d6adb1 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sun, 7 Jan 2018 14:37:09 +0200 Subject: [PATCH 2/2] fix flake8 warnings --- freqtrade/analyze.py | 4 ++-- freqtrade/tests/test_fiat_convert.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/freqtrade/analyze.py b/freqtrade/analyze.py index 4a3c0771e..4b16550c5 100644 --- a/freqtrade/analyze.py +++ b/freqtrade/analyze.py @@ -11,7 +11,7 @@ import talib.abstract as ta from pandas import DataFrame, to_datetime from freqtrade.exchange import get_ticker_history -from freqtrade.vendor.qtpylib.indicators import awesome_oscillator, PandasObject as qtpylib +import freqtrade.vendor.qtpylib.indicators as qtpylib logger = logging.getLogger(__name__) @@ -53,7 +53,7 @@ def populate_indicators(dataframe: DataFrame) -> DataFrame: dataframe['adx'] = ta.ADX(dataframe) # Awesome oscillator - dataframe['ao'] = awesome_oscillator(dataframe) + dataframe['ao'] = qtpylib.awesome_oscillator(dataframe) """ # Commodity Channel Index: values Oversold:<-100, Overbought:>100 dataframe['cci'] = ta.CCI(dataframe) diff --git a/freqtrade/tests/test_fiat_convert.py b/freqtrade/tests/test_fiat_convert.py index 7ad316042..4aa9b1c4f 100644 --- a/freqtrade/tests/test_fiat_convert.py +++ b/freqtrade/tests/test_fiat_convert.py @@ -116,8 +116,8 @@ def test_fiat_convert_get_price(mocker): def test_fiat_convert_without_network(mocker): - Pymarketcap = MagicMock(side_effect=ImportError('Oh boy, you have no network!')) - mocker.patch('freqtrade.fiat_convert.Pymarketcap', Pymarketcap) + pymarketcap = MagicMock(side_effect=ImportError('Oh boy, you have no network!')) + mocker.patch('freqtrade.fiat_convert.Pymarketcap', pymarketcap) fiat_convert = CryptoToFiatConverter() assert fiat_convert._coinmarketcap is None