diff --git a/.gitignore b/.gitignore index 7cee2507..afe91e21 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ venv3/ .coverage .mypy_cache .pytest_cache +.python-version **/coverage.xml **/htmlcov/** diff --git a/metadata_service/entity/badge.py b/metadata_service/entity/badge.py index 540516c5..12337108 100644 --- a/metadata_service/entity/badge.py +++ b/metadata_service/entity/badge.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 import attr -from marshmallow_annotations.ext.attrs import AttrsSchema +from marshmallow3_annotations.ext.attrs import AttrsSchema @attr.s(auto_attribs=True, kw_only=True) diff --git a/metadata_service/entity/dashboard_detail.py b/metadata_service/entity/dashboard_detail.py index 5e46f635..e9a348b5 100644 --- a/metadata_service/entity/dashboard_detail.py +++ b/metadata_service/entity/dashboard_detail.py @@ -7,7 +7,7 @@ from amundsen_common.models.popular_table import PopularTable from amundsen_common.models.table import Badge, Tag from amundsen_common.models.user import User -from marshmallow_annotations.ext.attrs import AttrsSchema +from marshmallow3_annotations.ext.attrs import AttrsSchema from metadata_service.entity.dashboard_query import DashboardQuery diff --git a/metadata_service/entity/dashboard_query.py b/metadata_service/entity/dashboard_query.py index d9531a08..2cad5bd4 100644 --- a/metadata_service/entity/dashboard_query.py +++ b/metadata_service/entity/dashboard_query.py @@ -4,7 +4,7 @@ from typing import Optional import attr -from marshmallow_annotations.ext.attrs import AttrsSchema +from marshmallow3_annotations.ext.attrs import AttrsSchema @attr.s(auto_attribs=True, kw_only=True) diff --git a/metadata_service/entity/dashboard_summary.py b/metadata_service/entity/dashboard_summary.py index 109036a2..8bd3834c 100644 --- a/metadata_service/entity/dashboard_summary.py +++ b/metadata_service/entity/dashboard_summary.py @@ -5,7 +5,7 @@ import attr from amundsen_common.models.dashboard import DashboardSummary as Summary -from marshmallow_annotations.ext.attrs import AttrsSchema +from marshmallow3_annotations.ext.attrs import AttrsSchema @attr.s(auto_attribs=True, kw_only=True) diff --git a/metadata_service/entity/description.py b/metadata_service/entity/description.py index 18e159d2..333583ce 100644 --- a/metadata_service/entity/description.py +++ b/metadata_service/entity/description.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 import attr -from marshmallow_annotations.ext.attrs import AttrsSchema +from marshmallow3_annotations.ext.attrs import AttrsSchema @attr.s(auto_attribs=True, kw_only=True) diff --git a/metadata_service/entity/tag_detail.py b/metadata_service/entity/tag_detail.py index 73940eed..fb800843 100644 --- a/metadata_service/entity/tag_detail.py +++ b/metadata_service/entity/tag_detail.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 import attr -from marshmallow_annotations.ext.attrs import AttrsSchema +from marshmallow3_annotations.ext.attrs import AttrsSchema @attr.s(auto_attribs=True, kw_only=True) diff --git a/requirements.txt b/requirements.txt index 84b6cba8..34c2f395 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ typing-extensions==3.7.4 # A common package that holds the models deifnition and schemas that are used # accross different amundsen repositories. -amundsen-common>=0.8.1 +amundsen-common>=0.9.0 amundsen-gremlin>=0.0.7 boto3==1.17.23 @@ -66,4 +66,4 @@ overrides==2.5 typed-ast==1.4.2 isort[colors]~=5.4 marshmallow>=3.0,<=3.6 -marshmallow-annotations@git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bdef36555082df990ed9bef +marshmallow3-annotations>=1.0.0 diff --git a/setup.py b/setup.py index 0f51af61..bac27dc2 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup -__version__ = '3.3.0' +__version__ = '3.4.0' requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements.txt')