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

Remove any trace of distutils use as it is going to be removed in python 3.12 (fixes #51532) #51630

Merged
merged 3 commits into from
Jan 30, 2023

Conversation

rouault
Copy link
Contributor

@rouault rouault commented Jan 29, 2023

No description provided.

@github-actions github-actions bot added this to the 3.30.0 milestone Jan 29, 2023
@nyalldawson nyalldawson merged commit 982da52 into qgis:master Jan 30, 2023
@qgis-bot
Copy link
Collaborator

The backport to release-3_28 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b1d1f8cbd4... Remove any trace of distutils use as it is going to be removed in python 3.12 (fixes #51532)
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".

stdout
CONFLICT (modify/delete): tests/src/python/test_qgsrasterattributetablemodel.py deleted in HEAD and modified in b1d1f8cbd4 (Remove any trace of distutils use as it is going to be removed in python 3.12 (fixes #51532)).  Version b1d1f8cbd4 (Remove any trace of distutils use as it is going to be removed in python 3.12 (fixes #51532)) of tests/src/python/test_qgsrasterattributetablemodel.py left in tree.
Auto-merging tests/src/python/test_qgssymbollayer.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_28 release-3_28
# Navigate to the new working tree
cd .worktrees/backport-release-3_28
# Create a new branch
git switch --create backport-51630-to-release-3_28
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b1d1f8cbd4af895ca9f70666b9b3b5cd5d09103b,6da295f5d240808e425a5cb3df5419810e1c19a5,abb07fcbeb1c061b51550026bb2045ed54272499
# Push it to GitHub
git push --set-upstream origin backport-51630-to-release-3_28
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_28

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

@rouault
Copy link
Contributor Author

rouault commented Jan 30, 2023

manual backport in #51644

@rouault rouault removed the failed backport The automated backport attempt failed, needs a manual backport label Jan 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants