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

Doc fix ZZ_feature_maps (backport #13231) #13262

Merged
merged 2 commits into from
Oct 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 3, 2024

Summary

I have added docstrings for data, entanglement_blocks, num_parameters, and parameters properties in the ZZ_Feature_Map documentation. Also, I updated the code example where to concatenate two circuits, the "+" has been replaced with the "compose" operation.
#Closes #12431

Details and comments

Also updated some formatting in the code example as the "copy to clipboard" button also copied the arrows which needed to be removed explicitly.


This is an automatic backport of pull request #13231 done by [Mergify](https://mergify.com).

* initial formatting changes

* .compose used for concatination of two circuits

* updated docstring data property

* updated entanglement_blocks docstring

* updated docstring of num_parameters

* updates docstring of parameters

* update _zz_feature_map.py documentation

* update changes to ZZ_Feature_Map

* update doc strings matched with parent class

* _zz_feature_map.py reformatted

(cherry picked from commit f1b2580)

# Conflicts:
#	qiskit/circuit/library/data_preparation/zz_feature_map.py
@mergify mergify bot requested a review from a team as a code owner October 3, 2024 05:58
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Oct 3, 2024
Copy link
Contributor Author

mergify bot commented Oct 3, 2024

Cherry-pick of f1b2580 has failed:

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

You are currently cherry-picking commit f1b25806e.
  (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:   qiskit/circuit/library/blueprintcircuit.py
	modified:   qiskit/circuit/library/data_preparation/pauli_feature_map.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qiskit/circuit/library/data_preparation/zz_feature_map.py

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

@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 following people are relevant to this code:

  • @Cryoris
  • @Qiskit/terra-core
  • @ajavadia

@github-actions github-actions bot added documentation Something is not clear or an error documentation Changelog: None Do not include in changelog Community PR PRs from contributors that are not 'members' of the Qiskit repo labels Oct 3, 2024
@Cryoris Cryoris removed the conflicts used by mergify when there are conflicts in a port label Oct 3, 2024
@coveralls
Copy link

Pull Request Test Coverage Report for Build 11156786770

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 16 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.005%) to 89.749%

Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/lex.rs 4 91.98%
crates/qasm2/src/parse.rs 12 97.15%
Totals Coverage Status
Change from base Build 11148098131: -0.005%
Covered Lines: 66886
Relevant Lines: 74526

💛 - Coveralls

@Cryoris Cryoris added this pull request to the merge queue Oct 3, 2024
Merged via the queue into stable/1.2 with commit 1657a72 Oct 3, 2024
17 checks passed
@Cryoris Cryoris deleted the mergify/bp/stable/1.2/pr-13231 branch October 4, 2024 09:40
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 Community PR PRs from contributors that are not 'members' of the Qiskit repo documentation Something is not clear or an error documentation
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants