Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nicfit/mishmash
Browse files Browse the repository at this point in the history
* 'master' of github.com:nicfit/mishmash:
  Update pytest-runner from 2.11.1 to 2.12.1 (#182)
  Update zope.interface from 4.4.2 to 4.4.3 (#191)
  Update babel from 2.5.0 to 2.5.1 (#187)
  Update tox from 2.8.0 to 2.8.2 (#185)
  Update wheel from 0.29.0 to 0.30.0 (#186)
  Update pytest from 3.2.1 to 3.2.2 (#184)
  Update repoze.lru from 0.6 to 0.7 (#183)
  • Loading branch information
nicfit committed Sep 27, 2017
2 parents 05e320d + ae92b7a commit ab1f684
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ 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
repoze.lru==0.6 # via pyramid, pyramid-debugtoolbar
repoze.lru==0.7 # via pyramid, pyramid-debugtoolbar
six==1.10.0 # via eyed3, python-dateutil, sqlalchemy-utils
sqlalchemy-utils==0.32.16
sqlalchemy==1.1.14 # via alembic, sqlalchemy-utils, zope.sqlalchemy
Expand All @@ -40,5 +40,5 @@ venusian==1.1.0 # via pyramid
waitress==1.0.2
webob==1.7.3 # via pyramid
zope.deprecation==4.3.0 # via pyramid
zope.interface==4.4.2 # via pyramid, transaction, zope.sqlalchemy
zope.interface==4.4.3 # via pyramid, transaction, zope.sqlalchemy
zope.sqlalchemy==0.7.7
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Sphinx==1.6.3
babel==2.5.0
babel==2.5.1
check-manifest==0.35
flake8==3.4.1
ipdb==0.10.3
nicfit.py[cookiecutter]==0.6.5
pip-tools==1.9.0
sphinx_bootstrap_theme==0.6.0
tox==2.8.0
tox==2.8.2
twine==1.9.1
wheel==0.29.0
wheel==0.30.0
4 changes: 2 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
factory-boy==2.9.2
faker==0.7.18
pytest==3.2.1
pytest==3.2.2
pytest-cov==2.5.1
pytest-postgres==0.2.0
pytest-runner==2.11.1
pytest-runner==2.12.1

0 comments on commit ab1f684

Please sign in to comment.