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

[chore] Remove Python 3.7 support (backport #5844) #5847

Merged
merged 7 commits into from
Dec 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2024

Description

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

Cherry-pick of 13f87e7 has failed:

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

You are currently cherry-picking commit 13f87e76.
  (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)

Changes to be committed:
	modified:   .github/workflows/tests.yml
	modified:   docs/source/getting_started.md
	modified:   pyproject.toml
	modified:   tox.ini
	modified:   wrapper/pyproject.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README-zh-cn.md
	both modified:   README.md

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

(cherry picked from commit 13f87e7)

# Conflicts:
#	README-zh-cn.md
#	README.md
@mergify mergify bot added 2021 backport Backport pull request created by Mergify conflicts Conflict with its base branch labels Dec 7, 2024
Copy link
Contributor Author

mergify bot commented Dec 7, 2024

Cherry-pick of 13f87e7 has failed:

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

You are currently cherry-picking commit 13f87e76.
  (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)

Changes to be committed:
	modified:   .github/workflows/tests.yml
	modified:   docs/source/getting_started.md
	modified:   pyproject.toml
	modified:   tox.ini
	modified:   wrapper/pyproject.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README-zh-cn.md
	both modified:   README.md

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
Contributor

github-actions bot commented Dec 7, 2024

Hi @mergify[bot], I have deleted the conflicted deleted files in this pull request. Please check it again. Thanks!

@haiiliin haiiliin removed the conflicts Conflict with its base branch label Dec 7, 2024
@mergify mergify bot merged commit 6ad4d18 into 2021 Dec 7, 2024
3 checks passed
@mergify mergify bot deleted the mergify/bp/2021/pr-5844 branch December 7, 2024 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2021 backport Backport pull request created by Mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant