diff --git a/requirements-dev.txt b/requirements-dev.txt index 2712ec2..0aecd01 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -47,7 +47,7 @@ lazy-object-proxy==1.2.2 # via astroid livereload==2.4.1 # via sphinx-autobuild mako==1.0.4 markupsafe==0.23 -marshmallow==2.9.1 +marshmallow==2.15.1 mccabe==0.5.2 # via flake8, pylint meepo2==0.2.5 mock==2.0.0 # via pytest-mock diff --git a/requirements.in b/requirements.in index 385a4a8..768e044 100644 --- a/requirements.in +++ b/requirements.in @@ -12,7 +12,7 @@ raven>=5.2,<6.0 python-decouple>=3.0,<3.1 python-dateutil>=2.6,<2.7 -marshmallow>=2.9,<2.10 +marshmallow>=2.9,<2.16 ipaddress>=1.0,<1.1 enum34>=1.1.6,<1.2 more-itertools>=3.2,<4.0 diff --git a/requirements.txt b/requirements.txt index 9b5be1b..6caf57b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ jinja2==2.7.3 # via flask, flask-babel https://github.com/huskar-org/kazoo/archive/2.0.post5.zip#egg=kazoo mako==1.0.4 # via alembic markupsafe==0.23 # via jinja2, mako -marshmallow==2.9.1 +marshmallow==2.15.1 meepo2==0.2.5 more-itertools==3.2.0 mysql-replication==0.5 # via meepo2