Merge branch 'master' into pyup-update-tox-3.6.1-to-3.7.0

karma0 · Jan 11, 2019 · 81c1679 · 81c1679
2 parents 7ce8675 + 9d9d82a
commit 81c1679
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -2,4 +2,4 @@
 wheel==0.32.3
 pip==18.1
 flake8==3.6.0
-Sphinx==1.8.2
+Sphinx==1.8.3
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -1,4 +1,4 @@
-marshmallow==2.16.3
-ccxt==1.18.29
+ccxt==1.18.120
+marshmallow==2.17.0
 bors==0.3.6
 Click==7.0
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,5 +1,6 @@
 -r prod.txt
-pytest==4.0.1
+
 tox==3.7.0
+pytest==4.1.0
 coverage==4.5.2
-pytest-cov==2.6.0
+pytest-cov==2.6.1