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

Pin sphinx-autodoc-typehints (backport #9377) #9378

Merged
merged 2 commits into from
Jan 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2023

This is an automatic backport of pull request #9377 done by Mergify.
Cherry-pick of 3d8a6e0 has failed:

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

You are currently cherry-picking commit 3d8a6e039.
  (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:   constraints.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   requirements-dev.txt

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

The 1.21.0 release appears to have changed the spacing in its outputs,
which is causing a bunch of Sphinx/docutils warnings for some of our
docstrings.

(cherry picked from commit 3d8a6e0)

# Conflicts:
#	requirements-dev.txt
@mergify mergify bot requested a review from a team as a code owner January 16, 2023 13:38
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Jan 16, 2023
@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 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 Jan 16, 2023
@mergify mergify bot merged commit 13e1ff6 into stable/0.22 Jan 16, 2023
@mergify mergify bot deleted the mergify/bp/stable/0.22/pr-9377 branch January 16, 2023 15:10
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.

2 participants