Merge branch 'master' into pyup-update-coverage-4.5.3-to-4.5.4

karma0 · Sep 7, 2019 · 66702b3 · 66702b3
2 parents 0954b65 + b8ca8e8
commit 66702b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,6 +1,6 @@
 -r test.txt
 
-pip==19.1.1
-wheel==0.33.4
-Sphinx==2.1.2
+wheel==0.33.6
+pip==19.2.3
+Sphinx==2.2.0
 flake8==3.7.7
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -1,4 +1,4 @@
-marshmallow==2.19.5
-ccxt==1.18.841
+marshmallow==3.0.3
+ccxt==1.18.1123
 bors==0.3.6
 Click==7.0
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,6 +1,6 @@
 -r prod.txt
 
-tox==3.13.1
-pytest==4.6.3
 coverage==4.5.4
+pytest==5.1.2
+tox==3.14.0
 pytest-cov==2.7.1