merging develop into async. requirement.txt conflict resolved

2018-09-06 20:28:07 +02:00
parent e9deb928f6 0004b32411
commit 13ffd88053
9 changed files with 235 additions and 99 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-ccxt==1.17.205
+ccxt==1.17.233
 SQLAlchemy==1.2.11
-python-telegram-bot==10.1.0
+python-telegram-bot==11.1.0
 arrow==0.12.1
 cachetools==2.1.0
 requests==2.19.1
@@ -12,10 +12,10 @@ scipy==1.1.0
 jsonschema==2.6.0
 numpy==1.15.1
 TA-Lib==0.4.17
-pytest==3.7.3
+pytest==3.7.4
 pytest-mock==1.10.0
-pytest-cov==2.5.1
 pytest-asyncio==0.9.0
+pytest-cov==2.6.0
 tabulate==0.8.2
 coinmarketcap==5.0.3