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

ci(gevent): pin greenlet for legacy gevent versions (backport #4437) #4454

Merged
merged 3 commits into from Nov 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 3, 2022

This is an automatic backport of pull request #4437 done by Mergify.
Cherry-pick of b85fca2 has failed:

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

You are currently cherry-picking commit b85fca25.
  (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:   tox.ini

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Earlier versions of gevent (v1.1, v1.2, v1.3, v1.4, v20.9) only specify a minimum greenlet version. greenlet v2.0 updated its ABI to support py3.11 and is only compatible with gevent>=22.10.2..

This change updates gevent and opentracer tests to install greenlet<2 if gevent<=20.9 is used.

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
(cherry picked from commit b85fca2)

# Conflicts:
#	tox.ini
@mergify mergify bot requested a review from a team as a code owner November 3, 2022 14:03
@mergify mergify bot added the conflicts label Nov 3, 2022
@mergify mergify bot removed the conflicts label Nov 3, 2022
tox.ini Outdated Show resolved Hide resolved
tox.ini Outdated Show resolved Hide resolved
tox.ini Outdated Show resolved Hide resolved
tox.ini Outdated Show resolved Hide resolved
@mabdinur mabdinur added the changelog/no-changelog A changelog entry is not required for this PR. label Nov 3, 2022
@Kyle-Verhoog Kyle-Verhoog merged commit bfe56c4 into 1.5 Nov 8, 2022
@Kyle-Verhoog Kyle-Verhoog deleted the mergify/bp/1.5/pr-4437 branch November 8, 2022 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants