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 some tests on newer gdal, proj versions #59620

Merged
merged 3 commits into from
Nov 28, 2024

Conversation

nyalldawson
Copy link
Collaborator

No description provided.

Change wkt to a crs which won't be identified as EPSG:4326 on newer proj versions
Copy link

github-actions bot commented Nov 27, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 4bd0b21)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 4bd0b21)

@nyalldawson nyalldawson merged commit c65d9e2 into qgis:master Nov 28, 2024
30 checks passed
@nyalldawson nyalldawson deleted the gdal_39 branch November 28, 2024 01:55
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0de34c066a4... Fix test on newer proj
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging tests/src/core/testqgsgdalprovider.cpp
[backport-59620-to-release-3_34 79edeb55919] Adapt test for GDAL 3.9 results
 Author: Nyall Dawson <[email protected]>
 Date: Thu Nov 28 08:20:13 2024 +1000
 1 file changed, 4 insertions(+)
Auto-merging tests/src/python/test_qgsprojectionselectionwidgets.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsprojectionselectionwidgets.py

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_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-59620-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 408afff3e228ab4a5c3d1fef9a1d50e6f03d524c,0de34c066a4465cdeb5d8073495b9f40f1abe793,4bd0b2114c42ec50c8be1e71e1877ecbd231d8f9
# Push it to GitHub
git push --set-upstream origin backport-59620-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 backport release-3_40 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants