From 16c1dcd2e167056e0729963ebe8ac325d90a6b51 Mon Sep 17 00:00:00 2001 From: Daniel Gaspar Date: Fri, 27 Mar 2020 22:30:08 +0000 Subject: [PATCH] [dependencies] Fix, marshmallow 3 breaks compat --- requirements.txt | 41 ++++++++++++++++++++++------------------- setup.py | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/requirements.txt b/requirements.txt index 728a16bd13..96d2a64b13 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,37 +2,40 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile +# pip-compile # -apispec[yaml]==1.1.1 +apispec[yaml]==1.1.1 # via Flask-AppBuilder (setup.py) attrs==19.1.0 # via jsonschema babel==2.6.0 # via flask-babel -click==7.0 -colorama==0.4.1 +click==7.0 # via Flask-AppBuilder (setup.py), flask +colorama==0.4.1 # via Flask-AppBuilder (setup.py) defusedxml==0.5.0 # via python3-openid -flask-babel==1.0.0 -flask-jwt-extended==3.18.0 -flask-login==0.4.1 -flask-openid==1.2.5 -flask-sqlalchemy==2.4.0 -flask-wtf==0.14.2 -flask==1.1.1 +flask-babel==1.0.0 # via Flask-AppBuilder (setup.py) +flask-jwt-extended==3.18.0 # via Flask-AppBuilder (setup.py) +flask-login==0.4.1 # via Flask-AppBuilder (setup.py) +flask-openid==1.2.5 # via Flask-AppBuilder (setup.py) +flask-sqlalchemy==2.4.0 # via Flask-AppBuilder (setup.py) +flask-wtf==0.14.2 # via Flask-AppBuilder (setup.py) +flask==1.1.1 # via Flask-AppBuilder (setup.py), flask-babel, flask-jwt-extended, flask-login, flask-openid, flask-sqlalchemy, flask-wtf itsdangerous==1.1.0 # via flask jinja2==2.10.1 # via flask, flask-babel -jsonschema==3.0.1 +jsonschema==3.0.1 # via Flask-AppBuilder (setup.py) markupsafe==1.1.1 # via jinja2 -marshmallow-enum==1.4.1 -marshmallow-sqlalchemy==0.16.2 -marshmallow==2.18.0 -prison==0.1.2 -pyjwt==1.7.1 +marshmallow-enum==1.4.1 # via Flask-AppBuilder (setup.py) +marshmallow-sqlalchemy==0.16.2 # via Flask-AppBuilder (setup.py) +marshmallow==2.18.0 # via Flask-AppBuilder (setup.py), marshmallow-enum, marshmallow-sqlalchemy +prison==0.1.2 # via Flask-AppBuilder (setup.py) +pyjwt==1.7.1 # via Flask-AppBuilder (setup.py), flask-jwt-extended pyrsistent==0.14.11 # via jsonschema -python-dateutil==2.8.0 +python-dateutil==2.8.0 # via Flask-AppBuilder (setup.py) python3-openid==3.1.0 # via flask-openid pytz==2018.9 # via babel, flask-babel pyyaml==5.1 # via apispec six==1.12.0 # via flask-jwt-extended, jsonschema, prison, pyrsistent, python-dateutil, sqlalchemy-utils -sqlalchemy-utils==0.33.9 +sqlalchemy-utils==0.33.9 # via Flask-AppBuilder (setup.py) sqlalchemy==1.3.1 # via flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils werkzeug==0.15.5 # via flask, flask-jwt-extended wtforms==2.2.1 # via flask-wtf + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/setup.py b/setup.py index f662d46f2c..06a58ba6ee 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def desc(): "Flask-WTF>=0.14.2, <1", "Flask-JWT-Extended>=3.18, <4", "jsonschema>=3.0.1, <4", - "marshmallow>=2.18.0, <4.0.0", + "marshmallow>=2.18.0, <3.0.0", "marshmallow-enum>=1.4.1, <2", "marshmallow-sqlalchemy>=0.16.1, <1", "python-dateutil>=2.3, <3",