Merge branch 'master' into pyup-update-py-1.4.34-to-1.5.2

zdict · Jan 26, 2018 · 7794698 · 7794698
2 parents 0175470 + 492f096
commit 7794698
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 57 deletions.
diff --git a/Pipfile b/Pipfile
@@ -1,20 +1,22 @@
 [[source]]
+
 url = "https://pypi.python.org/simple"
 verify_ssl = true
 name = "pypi"
 
+
 [packages]
 
-"beautifulsoup4" = "==4.6.0"
+beautifulsoup4 = "==4.6.0"
 peewee = "==2.10.1"
 requests = "==2.18.4"
 
 
 [dev-packages]
 
-coverage = "==4.4.1"
-"flake8" = "==3.4.1"
+coverage = "==4.4.2"
+flake8 = "==3.4.1"
 pyjokes = "==0.5.0"
 pytest = "==3.2.2"
-"pytest-cov" = "==2.5.1"
-"pytest-flake8" = "==0.8.1"
+pytest-cov = "==2.5.1"
+pytest-flake8 = "==0.8.1"
diff --git a/Pipfile.lock b/Pipfile.lock