Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

canonicalized extra names #6541

Merged
merged 4 commits into from
Oct 3, 2022

Conversation

dimbleby
Copy link
Contributor

@neersighted neersighted added status/waiting-on-core Requires changes to poetry-core first impact/backport Requires backport to stable branch impact/changelog Requires a changelog entry backport/1.2 area/installer Related to the dependency installer labels Sep 17, 2022
@neersighted neersighted added this to the 1.3 milestone Sep 17, 2022
@dimbleby dimbleby force-pushed the canonicalize-extras branch from 1043315 to 5c1cf9d Compare October 3, 2022 07:59
@radoering radoering force-pushed the canonicalize-extras branch from 55a9a07 to 8e4e45e Compare October 3, 2022 17:37
@radoering radoering force-pushed the canonicalize-extras branch from 8e4e45e to 0f363e6 Compare October 3, 2022 17:43
@radoering radoering enabled auto-merge (squash) October 3, 2022 17:44
@radoering radoering merged commit 44a89cb into python-poetry:master Oct 3, 2022
@poetry-bot
Copy link

poetry-bot bot commented Oct 3, 2022

The backport to 1.2 failed:

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

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-1.2 1.2
# Navigate to the new working tree
cd .worktrees/backport-1.2
# Create a new branch
git switch --create backport-6541-to-1.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 44a89cbd7530bc3c50c87f672c221f61125faf54
# Push it to GitHub
git push --set-upstream origin backport-6541-to-1.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.2

Then, create a pull request where the base branch is 1.2 and the compare/head branch is backport-6541-to-1.2.

radoering added a commit to radoering/poetry that referenced this pull request Oct 3, 2022
(cherry picked from commit 44a89cb)

Co-authored-by: Randy Döring <30527984+radoering@users.noreply.github.com>
radoering added a commit to radoering/poetry that referenced this pull request Oct 3, 2022
(cherry picked from commit 44a89cb)

Co-authored-by: Randy Döring <30527984+radoering@users.noreply.github.com>
radoering added a commit to radoering/poetry that referenced this pull request Oct 3, 2022
(cherry picked from commit 44a89cb)

Co-authored-by: Randy Döring <30527984+radoering@users.noreply.github.com>
neersighted pushed a commit that referenced this pull request Oct 3, 2022
(cherry picked from commit 44a89cb)

Co-authored-by: Randy Döring <30527984+radoering@users.noreply.github.com>
@dimbleby dimbleby deleted the canonicalize-extras branch October 3, 2022 21:54
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
area/installer Related to the dependency installer impact/backport Requires backport to stable branch impact/changelog Requires a changelog entry status/waiting-on-core Requires changes to poetry-core first
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants