Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dependencies] Fix, support marshmallow 3 #1334

Merged
merged 17 commits into from
Jun 1, 2020
Merged

[dependencies] Fix, support marshmallow 3 #1334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e299f12
[dependencies] Fix, support marshmallow 3
dpgaspar Mar 27, 2020
d3c7ab4
Merge branch 'master' into test/mashmallow3
dpgaspar May 18, 2020
595fb5c
working version
dpgaspar May 18, 2020
914c156
Fix and bump marshmallow-sqlalchemy
dpgaspar May 18, 2020
10a71b7
bump apispec
dpgaspar May 18, 2020
f9904d4
bump apispec
dpgaspar May 19, 2020
405aec1
Fix, enum for marshmallow 3
dpgaspar May 21, 2020
2f05131
Fix, enum for marshmallow 3
dpgaspar May 21, 2020
810b388
Merge branch 'master' into test/mashmallow3
dpgaspar May 21, 2020
e0d23bf
Merge branch 'master' into test/mashmallow3
dpgaspar Jun 1, 2020
5acd652
type annotations and a bit of cleaning up
dpgaspar Jun 1, 2020
da52f73
tests and BaseModelSchema to help developers
dpgaspar Jun 1, 2020
8b2e338
test for functions
dpgaspar Jun 1, 2020
e26ca41
fix setup versions
dpgaspar Jun 1, 2020
d99b15c
Fix tests for field functions
dpgaspar Jun 1, 2020
23dade7
Merge branch 'master' into test/mashmallow3
dpgaspar Jun 1, 2020
25e1d37
dummy commit trigger travis
dpgaspar Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[dependencies] Fix, support marshmallow 3
  • Loading branch information
@dpgaspar
dpgaspar committed Mar 27, 2020
commit e299f12e6f6374d36186e16df21180be11c44226
10 changes: 5 additions & 5 deletions flask_appbuilder/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@ def get_headless(self, pk, **kwargs) -> Response:
_show_model_schema = self.show_model_schema

_response["id"] = pk
_response[API_RESULT_RES_KEY] = _show_model_schema.dump(item, many=False).data
_response[API_RESULT_RES_KEY] = _show_model_schema.dump(item, many=False)
self.pre_get(_response)
return self.response(200, **_response)

Expand Down Expand Up @@ -1402,7 +1402,7 @@ def get_list_headless(self, **kwargs) -> Response:
select_columns=query_select_columns,
)
pks = self.datamodel.get_keys(lst)
_response[API_RESULT_RES_KEY] = _list_model_schema.dump(lst, many=True).data
_response[API_RESULT_RES_KEY] = _list_model_schema.dump(lst, many=True)
_response["ids"] = pks
_response["count"] = count
self.pre_get_list(_response)
Expand Down Expand Up @@ -1490,7 +1490,7 @@ def post_headless(self) -> Response:
**{
API_RESULT_RES_KEY: self.add_model_schema.dump(
item.data, many=False
).data,
),
"id": self.datamodel.get_pk_value(item.data),
},
)
Expand Down Expand Up @@ -1561,7 +1561,7 @@ def put_headless(self, pk) -> Response:
**{
API_RESULT_RES_KEY: self.edit_model_schema.dump(
item.data, many=False
).data
)
},
)
except IntegrityError as e:
Expand Down Expand Up @@ -1823,7 +1823,7 @@ def _merge_update_item(self, model_item, data):
:param data: python data structure
:return: python data structure
"""
data_item = self.edit_model_schema.dump(model_item, many=False).data
data_item = self.edit_model_schema.dump(model_item, many=False)
for _col in self.edit_columns:
if _col not in data.keys():
data[_col] = data_item[_col]
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jsonschema==3.0.1
markupsafe==1.1.1 # via jinja2
marshmallow-enum==1.4.1
marshmallow-sqlalchemy==0.16.2
marshmallow==2.18.0
marshmallow==3.5.1
prison==0.1.2
pyjwt==1.7.1
pyrsistent==0.14.11 # via jsonschema
Expand Down