Merge branch 'master' of github.com:nicfit/mishmash

* 'master' of github.com:nicfit/mishmash:
  Update check-manifest from 0.35 to 0.36 (#238)
  Update pip-tools from 1.10.2 to 1.11.0 (#244)
  Update plaster-pastedeploy from 0.4.1 to 0.4.2 (#237)
  Update python-magic from 0.4.13 to 0.4.15 (#245)
  Update webob from 1.7.3 to 1.7.4 (#236)
  Update pytest from 3.3.0 to 3.3.1 (#246)
  Update pip-tools from 1.10.1 to 1.10.2 (#239)
  Update pytest from 3.2.5 to 3.3.0 (#243)

requirements.txt

@@ -29,7 +29,7 @@ pyramid-tm==2.2
 pyramid==1.9.1
 python-dateutil==2.6.1    # via alembic
 python-editor==1.0.3      # via alembic
-python-magic==0.4.13      # via eyed3
+python-magic==0.4.15      # via eyed3
 repoze.lru==0.7           # via pyramid, pyramid-debugtoolbar
 six==1.11.0               # via eyed3, python-dateutil, sqlalchemy-utils
 sqlalchemy-utils==0.32.21

requirements/dev.txt

@@ -1,11 +1,11 @@
 Sphinx==1.6.5
 babel==2.5.1
-check-manifest==0.35
+check-manifest==0.36
 flake8==3.5.0
 git+https://github.com/nicfit/gitchangelog.git@nicfit.py
 ipdb==0.10.3
 nicfit.py[cookiecutter]==0.7
-pip-tools==1.10.1
+pip-tools==1.11.0
 pss==1.41
 pyaml==17.10.0
 sphinx_rtd_theme==0.2.4

requirements/test.txt

@@ -1,6 +1,6 @@
 factory-boy==2.9.2
 faker==0.8.7
-pytest==3.2.5
+pytest==3.3.1
 pytest-cov==2.5.1
 pytest-postgres==0.2.0
 pytest-runner==3.0