Skip to content

Commit

Permalink
fix: changed marshmallow-annotation version, temp solution (#81)
Browse files Browse the repository at this point in the history
* changed marshmallow version, temp solution

Signed-off-by: Allison Suarez Miranda <asuarezmiranda@lyft.com>

* trying lint fix out

Signed-off-by: Allison Suarez Miranda <asuarezmiranda@lyft.com>

* updated version

Signed-off-by: Allison Suarez Miranda <asuarezmiranda@lyft.com>
  • Loading branch information
allisonsuarez authored Nov 11, 2020
1 parent 4a7eea4 commit ff9d2e2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -31,8 +31,9 @@
# 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@a7a2dc96932430369bd'
'ef36555082df990ed9bef#egg=marshmallow-annotations')
],
python_requires=">=3.6",
package_data={'amundsen_common': ['py.typed']},
Expand Down

0 comments on commit ff9d2e2

Please sign in to comment.