Merge branch 'develop' into convert-to-pytest

Dockerfile

@@ -1,17 +1,20 @@
 FROM    python:3.6.2
 
-RUN pip install numpy
 RUN apt-get update
 RUN apt-get -y install build-essential
+
+# Install TA-lib
 RUN  wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
 RUN tar zxvf ta-lib-0.4.0-src.tar.gz
 RUN cd ta-lib && ./configure && make && make install
 ENV LD_LIBRARY_PATH /usr/local/lib
 
-RUN     mkdir -p /freqtrade
+# Prepare environment
+RUN mkdir /freqtrade
+COPY . /freqtrade/
 WORKDIR /freqtrade
 
-ADD     ./requirements.txt /freqtrade/requirements.txt
+# Install dependencies and execute
-RUN     pip install -r requirements.txt
+RUN pip install -r requirements.txt
-ADD     . /freqtrade
+RUN pip install -e .
-CMD     python main.py
+CMD ["freqtrade"]

MANIFEST.in

@@ -1,3 +1,6 @@
 include LICENSE
 include README.md
 include config.json.example
+include freqtrade/rpc/*.py
+include freqtrade/tests/*.py
+include freqtrade/tests/testdata/*.json

README.md

@@ -65,7 +65,8 @@ $ cp config.json.example config.json
 $ python -m venv .env
 $ source .env/bin/activate
 $ pip install -r requirements.txt
-$ ./main.py
+$ pip install -e .
+$ ./freqtrade/main.py
 ```
 
 There is also an [article](https://www.sales4k.com/blockchain/high-frequency-trading-bot-tutorial/) about how to setup the bot (thanks [@gurghet](https://github.com/gurghet)).
@@ -73,7 +74,7 @@ There is also an [article](https://www.sales4k.com/blockchain/high-frequency-tra
 #### Execute tests
 
 ```
-$ python -m unittest
+$ python setup.py test
 ```
 
 #### Docker

config.json.example

@@ -3,14 +3,14 @@
     "stake_currency": "BTC",
     "stake_amount": 0.05,
     "dry_run": false,
-        "minimal_roi": {
+    "minimal_roi": {
-            "60":  0.0,
+        "60":  0.0,
-            "40":  0.01,
+        "40":  0.01,
-            "20":  0.02,
+        "20":  0.02,
-            "0":  0.03
+        "0":  0.03
-        },
+    },
-        "stoploss": -0.40,
+    "stoploss": -0.40,
-        "bid_strategy": {
+    "bid_strategy": {
         "ask_last_balance": 0.0
     },
     "bittrex": {

requirements.txt

@@ -9,6 +9,7 @@ pandas==0.20.3
 scikit-learn==0.19.0
 scipy==0.19.1
 jsonschema==2.6.0
+numpy==1.13.3
 TA-Lib==0.4.10
 pytest==3.2.2
 pytest-mock==1.6.3

setup.cfg

@@ -0,0 +1,3 @@
+[aliases]
+test=pytest
+