Merge pull request #1807 from freqtrade/fix/travis

fix dockerfile building

.pyup.yml

@@ -22,7 +22,7 @@ requirements:
   - requirements.txt
   - requirements-dev.txt
   - requirements-plot.txt
-  - requirements-pi.txt
+  - requirements-common.txt
 
 
 # configure the branch prefix the bot is using

Dockerfile

@@ -16,7 +16,7 @@ RUN cd /tmp && /tmp/install_ta-lib.sh && rm -r /tmp/*ta-lib*
 ENV LD_LIBRARY_PATH /usr/local/lib
 
 # Install dependencies
-COPY requirements.txt /freqtrade/
+COPY requirements.txt requirements-common.txt /freqtrade/
 RUN pip install numpy --no-cache-dir \
   && pip install -r requirements.txt --no-cache-dir
 

Dockerfile.pi

@@ -27,9 +27,9 @@ RUN wget https://github.com/jjhelmus/berryconda/releases/download/v2.0.0/Berryco
  && rm Berryconda3-2.0.0-Linux-armv7l.sh
 
 # Install dependencies
-COPY requirements-pi.txt /freqtrade/
+COPY requirements-common.txt /freqtrade/
 RUN ~/berryconda3/bin/conda install -y numpy pandas scipy \
- && ~/berryconda3/bin/pip install -r requirements-pi.txt --no-cache-dir
+ && ~/berryconda3/bin/pip install -r requirements-common.txt --no-cache-dir
 
 # Install and execute
 COPY . /freqtrade/

docs/installation.md

@@ -326,7 +326,7 @@ conda activate freqtrade
 conda install scipy pandas numpy
 
 sudo apt install libffi-dev
-python3 -m pip install -r requirements-pi.txt
+python3 -m pip install -r requirements-common.txt
 python3 -m pip install -e .
 ```
 

freqtrade/tests/optimize/test_hyperopt.py

@@ -1,7 +1,7 @@
 # pragma pylint: disable=missing-docstring,W0212,C0103
-from datetime import datetime
 import json
 import os
+from datetime import datetime
 from unittest.mock import MagicMock
 
 import pandas as pd
@@ -10,9 +10,9 @@ import pytest
 from freqtrade import DependencyException
 from freqtrade.data.converter import parse_ticker_dataframe
 from freqtrade.data.history import load_tickerdata_file
-from freqtrade.optimize.hyperopt import Hyperopt, start, setup_configuration
 from freqtrade.optimize.default_hyperopt import DefaultHyperOpts
-from freqtrade.resolvers import StrategyResolver, HyperOptResolver
+from freqtrade.optimize.hyperopt import Hyperopt, setup_configuration, start
+from freqtrade.resolvers import HyperOptResolver
 from freqtrade.state import RunMode
 from freqtrade.tests.conftest import log_has, patch_exchange
 from freqtrade.tests.optimize.test_backtesting import get_args
@@ -185,7 +185,6 @@ def test_start(mocker, default_conf, caplog) -> None:
         '--epochs', '5'
     ]
     args = get_args(args)
-    StrategyResolver({'strategy': 'DefaultStrategy'})
     start(args)
 
     import pprint
@@ -214,7 +213,6 @@ def test_start_failure(mocker, default_conf, caplog) -> None:
         '--epochs', '5'
     ]
     args = get_args(args)
-    StrategyResolver({'strategy': 'DefaultStrategy'})
     with pytest.raises(DependencyException):
         start(args)
     assert log_has(
@@ -224,7 +222,6 @@ def test_start_failure(mocker, default_conf, caplog) -> None:
 
 
 def test_loss_calculation_prefer_correct_trade_count(hyperopt) -> None:
-    StrategyResolver({'strategy': 'DefaultStrategy'})
 
     correct = hyperopt.calculate_loss(1, hyperopt.target_trades, 20)
     over = hyperopt.calculate_loss(1, hyperopt.target_trades + 100, 20)

requirements.txt

@@ -1,5 +1,5 @@
 # Load common requirements
--r requirements-pi.txt
+-r requirements-common.txt
 
 numpy==1.16.3
 pandas==0.24.2