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

Jump to bottom

Use new pip resolver in plugins tox env #7784

Merged
merged 1 commit into from Sep 23, 2020
Merged

Use new pip resolver in plugins tox env #7784

merged 1 commit into from Sep 23, 2020

Conversation

nicoddemus
Copy link
Member

Fix #7783

@nicoddemus nicoddemus added the needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch label Sep 23, 2020
@nicoddemus nicoddemus mentioned this pull request Sep 23, 2020
Closed
bluetech
bluetech approved these changes Sep 23, 2020
View reviewed changes
Copy link
Member

@bluetech bluetech left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@nicoddemus nicoddemus merged commit 3db2489 into pytest-dev:master Sep 23, 2020
@nicoddemus nicoddemus deleted the use-new-pip-solver-7783 branch September 23, 2020 12:32
nicoddemus added a commit to nicoddemus/pytest that referenced this pull request Sep 23, 2020
@nicoddemus
Merge pull request pytest-dev#7784 from nicoddemus/use-new-pip-solver…
45a645d 
…-7783

Use new pip resolver in plugins tox env
@nicoddemus
Copy link
Member Author

Backport: #7785

nicoddemus added a commit that referenced this pull request Sep 23, 2020
@nicoddemus
Merge pull request #7785 from nicoddemus/backport-7784
e886b17 
[6.0.x] Merge pull request #7784 from nicoddemus/use-new-pip-solver-7783
@nicoddemus nicoddemus added backported PR has been backported to the current bug-fix branch and removed needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch labels Sep 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bluetech bluetech bluetech approved these changes

Assignees
No one assigned
Labels
backported PR has been backported to the current bug-fix branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ci: plugins job fails due to conflicting pip requirements
2 participants
@nicoddemus @bluetech