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

fix qgsinterpolator with NULL value #43302

Merged
merged 3 commits into from
May 29, 2021

Conversation

vcloarec
Copy link
Member

@vcloarec vcloarec commented May 20, 2021

fix #43286 and #42689

@github-actions github-actions bot added this to the 3.20.0 milestone May 20, 2021
@vcloarec vcloarec added Bug Either a bug report, or a bug fix. Let's hope for the latter! Processing Relating to QGIS Processing framework or individual Processing algorithms Regression Something which used to work, but doesn't anymore labels May 20, 2021
@alexbruy
Copy link
Contributor

@vcloarec maybe it makes sense to add a test to prevent breakage in future?

@nicogodet
Copy link
Member

Does it fix #42689 too ?

@vcloarec
Copy link
Member Author

Does it fix #42689 too ?

surely

@vcloarec
Copy link
Member Author

@alexbruy , yes, with tests, it would be better... on my side, no time to write tests for now...

@nyalldawson
Copy link
Collaborator

Let's leave this open for now -- I'll add a test then we can merge

@vcloarec
Copy link
Member Author

or @nyalldawson , let me write a test later, I think I could find few time for it before 3.20 release...

@nyalldawson nyalldawson added the Requires Tests! Waiting on the submitter to add unit tests before eligible for merging label May 23, 2021
@vcloarec vcloarec force-pushed the fixInterpolationWithNullValue branch from b8ab5ff to e65d367 Compare May 27, 2021 19:04
@vcloarec vcloarec removed the Requires Tests! Waiting on the submitter to add unit tests before eligible for merging label May 27, 2021
@vcloarec
Copy link
Member Author

tests added

@rouault rouault merged commit 2983284 into qgis:master May 29, 2021
@qgis-bot
Copy link
Collaborator

The backport to release-3_16 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_16 release-3_16
# Navigate to the new working tree
cd .worktrees/backport-release-3_16
# Create a new branch
git switch --create backport-43302-to-release-3_16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 23ffd06cfdad8747f3f7485820bb4ffdfb12fe23,6f736d9bd56023aef43c975dbe15bd3aaa1fee37,e65d3676faff49cb82979f177e7c6c4715997dec
# Push it to GitHub
git push --set-upstream origin backport-43302-to-release-3_16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_16

Then, create a pull request where the base branch is release-3_16 and the compare/head branch is backport-43302-to-release-3_16.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter! Processing Relating to QGIS Processing framework or individual Processing algorithms Regression Something which used to work, but doesn't anymore
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error in IDW interpolation with null values
7 participants