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

Fixes handling multiple z axes when vertically regridding #525

Merged
merged 3 commits into from
Aug 14, 2023

Conversation

jasonb5
Copy link
Collaborator

@jasonb5 jasonb5 commented Aug 1, 2023

Description

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

If applicable:

  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass with my changes (locally and CI/CD build)
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have noted that this is a breaking change for a major release (fix or feature that would cause existing functionality to not work as expected)

Copy link
Collaborator

@tomvothecoder tomvothecoder left a comment

Choose a reason for hiding this comment

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

Hey @jasonb5, here is my code review. I pushed a commit instead of suggesting changes because it was easier to do. Let me know if you agree with my changes.

I'll try to fix the build workflow and merge once the PR is ready.

xcdat/regridder/base.py Show resolved Hide resolved
xcdat/regridder/base.py Outdated Show resolved Hide resolved
xcdat/regridder/base.py Show resolved Hide resolved
xcdat/regridder/xgcm.py Outdated Show resolved Hide resolved
@tomvothecoder tomvothecoder added the type: bug Inconsistencies or issues which will cause an issue or problem for users or implementors. label Aug 3, 2023
@jasonb5
Copy link
Collaborator Author

jasonb5 commented Aug 11, 2023

@tomvothecoder I'm fine with these changes, thanks.

@codecov
Copy link

codecov bot commented Aug 14, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (870b334) 100.00% compared to head (c6e9d20) 100.00%.

❗ Current head c6e9d20 differs from pull request most recent head 52129c9. Consider uploading reports for the commit 52129c9 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##              main      #525   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           15        15           
  Lines         1562      1590   +28     
=========================================
+ Hits          1562      1590   +28     
Files Changed Coverage Δ
xcdat/regridder/accessor.py 100.00% <100.00%> (ø)
xcdat/regridder/base.py 100.00% <100.00%> (ø)
xcdat/regridder/xgcm.py 100.00% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@tomvothecoder tomvothecoder force-pushed the fix_multiple_z_axes branch 2 times, most recently from c13afbc to d2c2a14 Compare August 14, 2023 17:24
@tomvothecoder
Copy link
Collaborator

Thanks @jasonb5. I'm fixing up the build workflow and will merge this PR once I'm done.

- Mamba env update should only skip if cache is not found
- Update skip-duplicate-actions to skip entire jobs if true
- Add `build-result` job as a workaround to matrix jobs not being considered successful by GitHub if they are skipped which blocks PR merges if those matrix jobs are required
@tomvothecoder tomvothecoder merged commit f8d33c0 into xCDAT:main Aug 14, 2023
9 checks passed
@jasonb5 jasonb5 deleted the fix_multiple_z_axes branch August 14, 2023 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: bug Inconsistencies or issues which will cause an issue or problem for users or implementors.
Projects
None yet
2 participants