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

Fix tox.ini (backport #9276) #9277

Merged
merged 4 commits into from
Dec 21, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2022

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

On branch mergify/bp/stable/0.22/pr-9276
Your branch is up to date with 'origin/stable/0.22'.

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

(cherry picked from commit e70ce50)

# Conflicts:
#	tox.ini
@mergify mergify bot requested a review from a team as a code owner December 11, 2022 14:25
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Dec 11, 2022
@qiskit-bot
Copy link
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the the following people are requested to review this:

  • @Qiskit/terra-core

jakelishman
jakelishman previously approved these changes Dec 11, 2022
@jakelishman jakelishman added type: qa Issues and PRs that relate to testing and code quality automerge Changelog: None Do not include in changelog and removed conflicts used by mergify when there are conflicts in a port labels Dec 11, 2022
@t-imamichi
Copy link
Member

t-imamichi commented Dec 12, 2022

#9272 is necessary for stable too. The following error occurs.

DeprecationWarning: Widget._active_widgets is deprecated.

(cherry picked from commit b4f4c34)
@t-imamichi
Copy link
Member

Shall I merge #9279 to this PR? We need both to pass CI.

@Cryoris Cryoris merged commit 62eaa5d into stable/0.22 Dec 21, 2022
@Cryoris Cryoris deleted the mergify/bp/stable/0.22/pr-9276 branch December 21, 2022 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: None Do not include in changelog type: qa Issues and PRs that relate to testing and code quality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants