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.

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

chore: remove marshmallow-enum dependency and bump FAB #24499

Merged
merged 6 commits into from
Jun 27, 2023

Conversation

dpgaspar
Copy link
Member

SUMMARY

Marshamallow and marshmallow-apispec support Enum types and since then marshmallow-enum as been archived.

This PR:

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

TESTING INSTRUCTIONS

ADDITIONAL INFORMATION

  • Has associated issue:
  • Required feature flags:
  • Changes UI
  • Includes DB Migration (follow approval process in SIP-59)
    • Migration is atomic, supports rollback & is backwards-compatible
    • Confirm DB migration upgrade and downgrade tested
    • Runtime estimates and downtime expectations provided
  • Introduces new feature or API
  • Removes existing feature or API

@codecov
Copy link

codecov bot commented Jun 23, 2023

Codecov Report

Merging #24499 (ee698f8) into master (2a4ef5c) will decrease coverage by 0.02%.
The diff coverage is 64.07%.

❗ Current head ee698f8 differs from pull request most recent head 51376bd. Consider uploading reports for the commit 51376bd to get more accurate results

@@            Coverage Diff             @@
##           master   #24499      +/-   ##
==========================================
- Coverage   69.03%   69.01%   -0.02%     
==========================================
  Files        1901     1901              
  Lines       74006    74014       +8     
  Branches     8115     8116       +1     
==========================================
- Hits        51088    51081       -7     
- Misses      20807    20822      +15     
  Partials     2111     2111              
Flag Coverage Δ
hive 53.89% <90.90%> (-0.01%) ⬇️
mysql ?
postgres 79.48% <90.90%> (-0.02%) ⬇️
presto 53.79% <90.90%> (-0.01%) ⬇️
python 83.39% <90.90%> (-0.11%) ⬇️
sqlite ?
unit 54.65% <90.90%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
.../packages/superset-ui-core/src/chart/types/Base.ts 100.00% <ø> (ø)
...rts/src/MixedTimeseries/EchartsMixedTimeseries.tsx 0.00% <ø> (ø)
...hart-echarts/src/MixedTimeseries/transformProps.ts 0.00% <0.00%> (ø)
...chart-echarts/src/Timeseries/EchartsTimeseries.tsx 0.00% <0.00%> (ø)
...gin-chart-echarts/src/Timeseries/transformProps.ts 56.77% <0.00%> (ø)
superset-frontend/src/SqlLab/App.jsx 0.00% <0.00%> (ø)
...d/src/SqlLab/components/AceEditorWrapper/index.tsx 67.07% <0.00%> (ø)
...frontend/src/SqlLab/components/SqlEditor/index.jsx 59.88% <ø> (ø)
...src/SqlLab/utils/reduxStateToLocalStorageHelper.js 80.00% <0.00%> (-20.00%) ⬇️
...perset-frontend/src/hooks/apiResources/queryApi.ts 100.00% <ø> (ø)
... and 16 more

... and 12 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@dpgaspar dpgaspar requested review from villebro, john-bodley and betodealmeida and removed request for john-bodley June 23, 2023 17:06
@@ -115,7 +115,7 @@ def test_default_missing_declaration_put_spec(self):
self.assertEqual(rv.status_code, 200)
response = json.loads(rv.data.decode("utf-8"))
expected_mutation_spec = {
"properties": {"id": {"format": "int32", "type": "integer"}},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dpgaspar is this a side-effect of how marshmallow-enum was encoding the data?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's actually a change done on apispec: marshmallow-code/apispec#595

breaking change on 4.0.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dpgaspar does that mean you're planning on holding off merging this until the next breaking release window?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, no, the 4.0.0 breaking change is on apispec, it's apispec==4.0.0, major 4 here is only a coincidence with future 4.0.0 on Superset

@EugeneTorap
Copy link
Contributor

Nice!
@dpgaspar Can you remove marshmallow_enum from setup.cfg and pin marshmallow in install_requires, setup.py?

@dpgaspar
Copy link
Member Author

Nice! @dpgaspar Can you remove marshmallow_enum from setup.cfg and pin marshmallow in install_requires, setup.py?

good point, but I don't think we need to pin mashmallow on setup.py since we are already pinning flask-appbuilder, and it does that for us

Copy link
Member

@villebro villebro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice! I verified that the configuration_method error that I was previously seeing on the codegen, where the enum values were missing, is now gone 👍 LGTM

@dpgaspar
Copy link
Member Author

Very nice! I verified that the configuration_method error that I was previously seeing on the codegen, where the enum values were missing, is now gone 👍 LGTM

Thank you for raising my attention to this issue, great work @villebro as always

@dpgaspar dpgaspar merged commit 0ddc0a6 into apache:master Jun 27, 2023
29 checks passed
@dpgaspar dpgaspar deleted the bump/fab-4.3.3 branch June 27, 2023 07:37
@mistercrunch mistercrunch added 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 3.0.0 labels Mar 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels size/M 🚢 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants