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

[8.17](backport #2895) Change the poetry export requirement to be >= 1.8 #2898

Merged
merged 3 commits into from
Jan 7, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 7, 2025

Change the poetry export requirement to be >= 1.8


This is an automatic backport of pull request #2895 done by Mergify.

(cherry picked from commit 4b3a21b)

# Conflicts:
#	tests/pyproject.toml
@mergify mergify bot requested a review from a team as a code owner January 7, 2025 10:38
Copy link
Author

mergify bot commented Jan 7, 2025

Cherry-pick of 4b3a21b has failed:

On branch mergify/bp/8.17/pr-2895
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 4b3a21b1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/pyproject.toml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Author

mergify bot commented Jan 7, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.17/pr-2895 upstream/mergify/bp/8.17/pr-2895
git merge upstream/8.17
git push upstream mergify/bp/8.17/pr-2895

@romulets romulets removed the conflicts label Jan 7, 2025
Copy link
Author

mergify bot commented Jan 7, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.17/pr-2895 upstream/mergify/bp/8.17/pr-2895
git merge upstream/8.17
git push upstream mergify/bp/8.17/pr-2895

@romulets romulets enabled auto-merge (squash) January 7, 2025 13:36
@romulets romulets merged commit 6f3c002 into 8.17 Jan 7, 2025
9 checks passed
@romulets romulets deleted the mergify/bp/8.17/pr-2895 branch January 7, 2025 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant