Merge branch 'master' into pyup-update-pyramid-1.6.1-to-1.9.1

OnroerendErfgoed · Nov 19, 2017 · 135dfe1 · 135dfe1
2 parents 5cdefc9 + b151f10
commit 135dfe1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -2,12 +2,12 @@
 --requirement requirements.txt
 
 #testing
-pytest==2.9.1
+pytest==3.2.5
 pytest-cov==2.2.1
-webtest==2.0.20
+webtest==2.0.29
 httpretty==0.8.14
 coveralls==1.1
 mock==1.3.0
 
 #wheel
-wheel==0.29.0
+wheel==0.30.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.9.1
+requests==2.18.4
 pyramid==1.9.1
-six==1.10.0
+six==1.11.0