From 7ef9fad30d8e7fae9e6e23ca39f33c8a44e51fec Mon Sep 17 00:00:00 2001 From: Allison Suarez Miranda Date: Mon, 9 Nov 2020 09:28:43 -0800 Subject: [PATCH 1/3] changed marshmallow version, temp solution Signed-off-by: Allison Suarez Miranda --- requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5312baf..4338cd9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ attrs==19.1.0 flake8==3.7.8 Flask==1.1.1 -marshmallow==2.15.3 -marshmallow-annotations==2.4.0 +marshmallow==3.6.0 +git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bdef36555082df990ed9bef#egg=marshmallow-annotations mypy==0.761 pytest>=4.6 pytest-cov diff --git a/setup.py b/setup.py index bb32baa..7c449b8 100644 --- a/setup.py +++ b/setup.py @@ -31,8 +31,8 @@ # long as they have a version of pyfoobar equal to or greater than 1.x # and less than 2.x installed. 'flask>=1.0.2', - 'marshmallow>=2.15.3,<3.0', - 'marshmallow-annotations>=2.4.0,<3.0' + 'marshmallow>=2.15.3,<=3.6', + 'git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bdef36555082df990ed9bef#egg=marshmallow-annotations' ], python_requires=">=3.6", package_data={'amundsen_common': ['py.typed']}, From f8f01a0ea21196e7665f58925498b493eaf196af Mon Sep 17 00:00:00 2001 From: Allison Suarez Miranda Date: Mon, 9 Nov 2020 09:53:53 -0800 Subject: [PATCH 2/3] trying lint fix out Signed-off-by: Allison Suarez Miranda --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7c449b8..e5b2b86 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,8 @@ # and less than 2.x installed. 'flask>=1.0.2', 'marshmallow>=2.15.3,<=3.6', - 'git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bdef36555082df990ed9bef#egg=marshmallow-annotations' + ('git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bd' + 'ef36555082df990ed9bef#egg=marshmallow-annotations') ], python_requires=">=3.6", package_data={'amundsen_common': ['py.typed']}, From 56c59c190a6d55483d0c741ce1f32b71e49e659c Mon Sep 17 00:00:00 2001 From: Allison Suarez Miranda Date: Wed, 11 Nov 2020 09:39:25 -0800 Subject: [PATCH 3/3] updated version Signed-off-by: Allison Suarez Miranda --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e5b2b86..16f779f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='amundsen-common', - version='0.5.7', + version='0.5.8', description='Common code library for Amundsen', long_description=open('README.md').read(), long_description_content_type='text/markdown',