From 6f2915e25e4c405df7641aca28fc04b6b178b63a Mon Sep 17 00:00:00 2001 From: gcarq Date: Mon, 30 Oct 2017 20:41:36 +0100 Subject: [PATCH] move qtpylib to vendor folder This is necessary to distribute qtpylib with freqtrade when you install it globally. --- MANIFEST.in | 5 +---- freqtrade/analyze.py | 2 +- freqtrade/tests/test_hyperopt.py | 8 ++++---- {qtpylib => freqtrade/vendor}/__init__.py | 0 freqtrade/vendor/qtpylib/__init__.py | 0 {qtpylib => freqtrade/vendor/qtpylib}/indicators.py | 0 6 files changed, 6 insertions(+), 9 deletions(-) rename {qtpylib => freqtrade/vendor}/__init__.py (100%) create mode 100644 freqtrade/vendor/qtpylib/__init__.py rename {qtpylib => freqtrade/vendor/qtpylib}/indicators.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 4e3f71aca..63508c05d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,5 @@ include LICENSE include README.md include config.json.example -include freqtrade/exchange/*.py -include freqtrade/rpc/*.py -include freqtrade/tests/*.py +recursive-include freqtrade *.py include freqtrade/tests/testdata/*.json -include qtpylib/*.py diff --git a/freqtrade/analyze.py b/freqtrade/analyze.py index 031641a4b..b99a67809 100644 --- a/freqtrade/analyze.py +++ b/freqtrade/analyze.py @@ -5,10 +5,10 @@ from datetime import timedelta import arrow import talib.abstract as ta from pandas import DataFrame, to_datetime -from qtpylib.indicators import awesome_oscillator, crossed_above from freqtrade import exchange from freqtrade.exchange import Bittrex, get_ticker_history +from freqtrade.vendor.qtpylib.indicators import awesome_oscillator logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') diff --git a/freqtrade/tests/test_hyperopt.py b/freqtrade/tests/test_hyperopt.py index 8cbe0ad26..ebb01b687 100644 --- a/freqtrade/tests/test_hyperopt.py +++ b/freqtrade/tests/test_hyperopt.py @@ -1,16 +1,16 @@ # pragma pylint: disable=missing-docstring -from operator import itemgetter import logging import os from functools import reduce from math import exp -import pytest -from pandas import DataFrame -from qtpylib.indicators import crossed_above +from operator import itemgetter +import pytest from hyperopt import fmin, tpe, hp, Trials, STATUS_OK +from pandas import DataFrame from freqtrade.tests.test_backtesting import backtest, format_results +from freqtrade.vendor.qtpylib.indicators import crossed_above logging.disable(logging.DEBUG) # disable debug logs that slow backtesting a lot diff --git a/qtpylib/__init__.py b/freqtrade/vendor/__init__.py similarity index 100% rename from qtpylib/__init__.py rename to freqtrade/vendor/__init__.py diff --git a/freqtrade/vendor/qtpylib/__init__.py b/freqtrade/vendor/qtpylib/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/qtpylib/indicators.py b/freqtrade/vendor/qtpylib/indicators.py similarity index 100% rename from qtpylib/indicators.py rename to freqtrade/vendor/qtpylib/indicators.py