bump: amundsencommon and switch to marshmallow3-annotations (#286)

Signed-off-by: Dmitriy Kunitskiy <[email protected]>

.gitignore

@@ -16,6 +16,7 @@ venv3/
 .coverage
 .mypy_cache
 .pytest_cache
+.python-version
 **/coverage.xml
 **/htmlcov/**
 

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)

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
 

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)

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)

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)

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)

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

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')