Migrate open source docs#91
Conversation
* fixes Qiskit/qiskit-metapackage#113 * added link to install instructions fixed some styles * Review changes - Add Q&A Format
* Updated Getting Started * Removed trailing whitespaces and long lines * Removed typo * eliminated build warnings * eliminated build warnings in getting started * edit getting_started * edit executing quantum programs * Update executing_quantum_programs.rst line length * fix code block formatting * fix circuit drawings * fix plain text code block syntax * update IBM Q Experience link
* Update install docs * Load.account() updates * Update get.backend * Add update link * Fix link * Fix typos * Address review comments * Fix line length
* Standardized hyperlinks and underscores * Fixed lint errors
…other_optims Add other optimization notebooks and fixes
* Set up CI with Azure Pipelines This commit adds the CI configuration for running sphinx builds in CI. [skip ci] * Add missing dep and start caching pip * Install pandoc and graphviz * Add cvxpy install for aer noise transformations * Move aqua tutorials that depend on CPLEX to legacy_tutorials There are 2 aqua tutorials that do not work unless CPLEX is installed. CPLEX is too involved and difficult to install in CI. It is also proprietary software which prohibits installing it in CI (since a CI system can't agree to the license terms). Honestly, I'm not entirely sure why aqua has modules in it that depend solely on having proprietary software installed, it feels like there should be an open alternative or if there is one already the tutorial should leverage that. To make the docs buildable this commit moves these problematic tutorials to the legacy directory so they're not built/run by default. * Workaround terra mpl drawer bug There is a bug in the mpl drawer in 0.19.0 (and 0.19.1) release where a custom instruction does not draw without a label parameter set. This will need to be fixed in terra, but in the meantime this worksaround the bug by manually setting a label. * Add texlive to installed packages * Install correct texlive metapackage with qcircuit * Correct package name again * Add another missing binary dep * Update qcircuit version as packaged version is too old * Try using tlmgr instead of manually downloading qcircuit * Try using more from tlmgr instead of apt * Fix typo * Use bash directly * Adjust texlive update script usage * Give up on tlmgr and try to manual install qcircuit again * Fix typo * revert aqua tutorial move and remove latex install * Remove section of aqua notebook 2 that requires cplex * Remove another notebook with cplex
…terra_adv_1 fix terra adv 1
Generated docs look good.
…circuits_1 fix spacing around equations in circuits_1
…transpiler_notebook Update 4_transpiler_passes_and_passmanager.ipynb
I found it confusing when reading initially, and hence wanted to reiterate that the qubit representing the MSB is left-most, indexed with 0.
Minor improvements to Getting Started tutorials.
* Don't use QPU complex * don't use the word 'limit' * Update docs/faqs/max_execution_time.rst * Update qiskit_ibm_runtime/options/options.py * Update qiskit_ibm_runtime/runtime_job.py * Update releasenotes/notes/0.11/job-cost-estimation-d0ba83dbc95c3f67.yaml * Clarify usage * reclarify reset time * rogue comma * fix whitespace & formatting * job -> system execution time --------- Co-authored-by: Kevin Tian <kevin.tian@ibm.com>
* Changes for Qiskit/qiskit-ibm-runtime#1806 * Update docs/faqs/max_execution_time.rst Co-authored-by: Jessie Yu <jessieyu@us.ibm.com> --------- Co-authored-by: Kevin Tian <kt474@cornell.edu> Co-authored-by: Jessie Yu <jessieyu@us.ibm.com> Co-authored-by: Kevin Tian <kevin.tian@ibm.com>
* big moves, import still works * most tests pass (some I cannot seem to run locally) * fix tests -- how to remove DiagonalGate? * typehints and docs * more type hints * Deprecate SQU * deprecate Snapshot * Fix missing future annotations import * minimize deprecation effort * Change to pending deprecation, no exact-location import supported * fix MCG<->MGC typo and snapshot deprecation * fix pylint, try fixing docs * remove gates from extensions toctree * Add reno, fully deprecate SQU and Snapshot * Apply Sasha's review comments - fix usage of .squ and .snapshot w/o import - fix docstring usage of extensions - fix tests * capture snapshot deprecation warning * review comments - capture warning of SQU - update reno to explicitly mention pending deprecation, add DiagonalGate and ExtensionError * missed `diagonal` method --------- Co-authored-by: Alexander Ivrii <alexi@il.ibm.com>
|
Ikko Eltociear Ashimine seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
|
The CLA checker is not correctly identifying that @elberttl has already signed the CLA in Qiskit/qiskit-tutorials#1231. The email 67720913+elberttl@users.noreply.github.com is the same in this PR as in qiskit-tutorials and when we merged qiskit-tutorials into qiskit; the CLA worked correctly with the qiskit merge, so I'm not sure what's going on. @elberttl, if you're around, it'd be helpful to please follow this link https://cla-assistant.io/Qiskit/documentation?pullRequest=91. But we should be fine either way since the CLA is for the entire Qiskit organization and it has already been signed. |
frankharkins
left a comment
There was a problem hiding this comment.
The script is good and the history looks reasonable; nice job :)
8a8e7d9 to
4269eb7
Compare
|
FYI I force pushed an update because I realized I left off the original names for some of the tutorials. I've confirmed that the below contributors signed the CLA. The CLA tool is only not working properly. For For some of these, you have to click "View details" on the merge commit to see that the CLI check passed:
So, we should be good to go. Merging. |
This reverts commit d72da5c.
#164) We didn't realize these also should be brought over. This uses the same script from #91, but with this file list: ``` docs/getting_started.rst docs/tutorials/circuits_advanced/03_advanced_circuit_visualization.ipynb # Original names docs/getting_started_with_qiskit.rst docs/tutorials/terra/advanced/3_advanced_circuit_visualization.ipynb docs/tutorials/circuits_advanced/3_advanced_circuit_visualization.ipynb ```
First part of Qiskit#22 and Qiskit#23. This copies over the open source files we plan to use in this repository. They are not actually used yet and still require some work like converting RST to MDX, but it gets the files and their Git history here to start the process. Qiskit docs are placed in the folder `qiskit-docs/` and Runtime docs in `runtime-docs`. These are only for unprocessed docs. Once a document is ready, we will move it to the official `docs/` folder and have it go live. This uses `git-filter-repo` to preserve all the Git history and author attribution from the respective open source repositories. It uses the below Python script and this [zipped folder](https://github.com/Qiskit/documentation/files/12835669/migrate-open-source.zip), using an approach very similar to @jakelishman's original work in Qiskit/qiskit#10611. This PR has no additional commits. It solely copies over the other repositories into this one. ``` # Runtime files docs/faqs/max_execution_time.rst docs/faqs/open_source_vs_ibm_cloud_primitives.rst ``` ``` # Qiskit files # start/ docs/migration_guides/algorithms_migration.rst docs/migration_guides/opflow_migration.rst docs/migration_guides/qi_migration.rst # build/ docs/tutorials/circuits/01_circuit_basics.ipynb docs/tutorials/circuits/1_getting_started_with_qiskit.ipynb docs/tutorials/circuits/2_plotting_data_in_qiskit.ipynb docs/tutorials/circuits_advanced/01_advanced_circuits.ipynb docs/tutorials/circuits_advanced/02_operators_overview.ipynb docs/tutorials/circuits_advanced/05_pulse_gates.ipynb docs/tutorials/circuits_advanced/06_building_pulse_schedules.ipynb docs/tutorials/circuits_advanced/07_pulse_scheduler.ipynb docs/explanation/endianness.rst # transpile/ docs/tutorials/circuits_advanced/04_transpiler_passes_and_passmanager.ipynb # test/ docs/how_to/use_estimator.rst docs/how_to/use_sampler.rst # run/ docs/tutorials/circuits_advanced/08_gathering_system_information.ipynb # other/ docs/faq.rst # Tutorial renames from the original qiskit-tutorials repo docs/tutorials/terra/fundamentals/1_getting_started_with_qiskit.ipynb docs/tutorials/terra/fundamentals/2_plotting_data_in_qiskit.ipynb docs/tutorials/terra/fundamentals/3_summary_of_quantum_operations.ipynb docs/tutorials/terra/advanced/1_advanced_circuits.ipynb docs/tutorials/terra/advanced/2_operators_overview.ipynb docs/tutorials/terra/advanced/3_advanced_circuit_visualization.ipynb docs/tutorials/terra/advanced/4_transpiler_passes_and_passmanager.ipynb docs/tutorials/circuits_advanced/1_advanced_circuits.ipynb docs/tutorials/circuits_advanced/2_operators_overview.ipynb docs/tutorials/circuits_advanced/3_advanced_circuit_visualization.ipynb docs/tutorials/circuits_advanced/4_transpiler_passes_and_passmanager.ipynb ``` Migration script: ```python import subprocess from tempfile import TemporaryDirectory from pathlib import Path QISKIT_ROOT = Path("../qiskit") RUNTIME_ROOT = Path("../qiskit-ibm-runtime") DOCS_ROOT = Path("./").resolve() # Expects script author to have this folder created. MIGRATION_FOLDER = DOCS_ROOT / "migrate-open-source" MAILMAP = MIGRATION_FOLDER / "mailmap.txt" def main() -> None: with TemporaryDirectory() as tmpdir: qiskit_dir = clone_repo(tmpdir, repo_name="qiskit") git_filter_repo( qiskit_dir, "qiskit-files.txt", "qiskit-messages.txt", dest_folder="qiskit-docs", ) merge_repo(qiskit_dir, remote_name="qiskit") runtime_dir = clone_repo(tmpdir, repo_name="qiskit-ibm-runtime") git_filter_repo( runtime_dir, "runtime-files.txt", "runtime-messages.txt", dest_folder="runtime-docs", ) merge_repo(runtime_dir, remote_name="runtime") def clone_repo(tmpdir: str, repo_name: str) -> Path: subprocess.run( [ "git", "clone", "--no-tags", "--single-branch", f"https://github.com/Qiskit/{repo_name}.git", ], check=True, cwd=tmpdir, ) return Path(tmpdir, repo_name) def git_filter_repo( repo_path: str, files_txt_name: str, msg_txt_file: str, dest_folder: str ) -> None: subprocess.run( [ "python3", MIGRATION_FOLDER / "git-filter-repo", "--paths-from-file", MIGRATION_FOLDER / files_txt_name, "--replace-message", MIGRATION_FOLDER / msg_txt_file, "--mailmap", MAILMAP, "--path-rename", f"docs/:{dest_folder}/", ], check=True, cwd=repo_path, ) def merge_repo(repo_path: str, remote_name: str) -> None: subprocess.run(["git", "remote", "add", remote_name, repo_path], check=True) subprocess.run(["git", "fetch", remote_name]) subprocess.run( ["git", "merge", "--allow-unrelated-histories", f"{remote_name}/main"] ) subprocess.run(["git", "remote", "remove", remote_name]) main() ``` --------- Co-authored-by: Paul Kassebaum <paul.kassebaum@ibm.com> Co-authored-by: Soolu Thomas <soolu.thomas@ibm.com> Co-authored-by: Laura Zdanski <Laura.Zdanski@ibm.com> Co-authored-by: Jay M. Gambetta <jay.gambetta@us.ibm.com> Co-authored-by: Diego M. Rodríguez <diego.plan9@gmail.com> Co-authored-by: Paul Nation <nonhermitian@gmail.com> Co-authored-by: Matthew Treinish <mtreinish@kortar.org> Co-authored-by: 3yakuya <3yakuya@outlook.com> Co-authored-by: Sristy Sangskriti <sristysangskriti007@gmail.com> Co-authored-by: Vismai Khanderao <59114226+Vismai-Khanderao@users.noreply.github.com> Co-authored-by: Wei Hu <wei.hu@kfquantum.com> Co-authored-by: gunchamalik <gunchamalik@gmail.com> Co-authored-by: zodiacfireworks <martin.vuelta@gmail.com> Co-authored-by: Emixem <64846036+Emixem@users.noreply.github.com> Co-authored-by: Julien Gacon <jul@zurich.ibm.com> Co-authored-by: wagnersj <wagnerse@ca.ibm.com> Co-authored-by: Bruno E. Ramírez Galindo <47431792+brunormzg@users.noreply.github.com> Co-authored-by: Peter J <peter.j@kakao.com> Co-authored-by: Kevin Krsulich <kevin.krsulich@ibm.com> Co-authored-by: Lauren Capelluto <lcapelluto@users.noreply.github.com> Co-authored-by: Luciano Bello <luciano.bello@ibm.com> Co-authored-by: Thomas Alexander <talexander@ibm.com> Co-authored-by: Divyanshu Singh <55018955+divshacker@users.noreply.github.com> Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com> Co-authored-by: jaleipekoglu <47296000+jaleipekoglu@users.noreply.github.com> Co-authored-by: SooluThomas <soolu.elto@gmail.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Eli Arbel <arbel@il.ibm.com> Co-authored-by: Parmeet Singh <76438148+singhmeet11@users.noreply.github.com> Co-authored-by: Aurélien Pupier <apupier@redhat.com> Co-authored-by: Ali Javadi-Abhari <ali.javadi@ibm.com> Co-authored-by: Kevin Krsulich <kevin@krsulich.net> Co-authored-by: Naoki Kanazawa <39517270+nkanazawa1989@users.noreply.github.com> Co-authored-by: Claudia Zendejas-Morales <ing.claudia@gmail.com> Co-authored-by: Glen <96159532+NG-Glen@users.noreply.github.com> Co-authored-by: Edwin Navarro <enavarro@comcast.net> Co-authored-by: Junye Huang <h.jun.ye@gmail.com> Co-authored-by: Rathish Cholarajan <rathishc24@gmail.com> Co-authored-by: Kazuki Tsuoka <103920010+king-p3nguin@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: InfamousPlatypus <45645300+InfamousPlatypus@users.noreply.github.com> Co-authored-by: Luciano Bello <bel@zurich.ibm.com> Co-authored-by: Filippo Tramonto <11334590+filippotramonto@users.noreply.github.com> Co-authored-by: Kazuki Tsuoka <kazukitsuoka@g.ecc.u-tokyo.ac.jp> Co-authored-by: Kevin Hartman <kevin@hart.mn> Co-authored-by: Frank Harkins <frankharkins@users.noreply.github.com> Co-authored-by: Rebecca Dimock <66339736+beckykd@users.noreply.github.com> Co-authored-by: Elena Peña Tapia <57907331+ElePT@users.noreply.github.com> Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com> Co-authored-by: Declan Millar <declan.millar@ibm.com> Co-authored-by: Julien Gacon <gaconju@gmail.com> Co-authored-by: Guillermo-Mijares-Vilarino <106545082+Guillermo-Mijares-Vilarino@users.noreply.github.com> Co-authored-by: Kevin Tian <kevin.tian@ibm.com> Co-authored-by: Emil Magni <emilmagni@gmail.com> Co-authored-by: Will Shanks <wshaos@posteo.net> Co-authored-by: Jim Garrison <jim@garrison.cc> Co-authored-by: Abby Mitchell <23662430+javabster@users.noreply.github.com> Co-authored-by: Frank Harkins <frankharkins@hotmail.co.uk> Co-authored-by: Jessie Yu <jessieyu@us.ibm.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: Mehmet Keçeci <WhiteSymmetry@users.noreply.github.com> Co-authored-by: Kuba Pilch <6464505+3yakuya@users.noreply.github.com> Co-authored-by: Soon Teh <11854984+soon-teh@users.noreply.github.com> Co-authored-by: Jake Lishman <jake.lishman@ibm.com> Co-authored-by: Shilpa Mahato <61791872+shil-m@users.noreply.github.com> Co-authored-by: Elbert <67720913+elberttl@users.noreply.github.com> Co-authored-by: Bochen "Daniel" Tan <33230390+tbcdebug@users.noreply.github.com> Co-authored-by: Kevin Tian <kt474@cornell.edu> Co-authored-by: Alexander Ivrii <alexi@il.ibm.com> Co-authored-by: rht <rhtbot@protonmail.com>
I accidentally squash merged 😕
Recreates Qiskit#91, but without squash merging.
Qiskit#164) We didn't realize these also should be brought over. This uses the same script from Qiskit#91, but with this file list: ``` docs/getting_started.rst docs/tutorials/circuits_advanced/03_advanced_circuit_visualization.ipynb # Original names docs/getting_started_with_qiskit.rst docs/tutorials/terra/advanced/3_advanced_circuit_visualization.ipynb docs/tutorials/circuits_advanced/3_advanced_circuit_visualization.ipynb ```
Adds the runtime tutorial notebooks as per Qiskit#1135. I couldn't use the same approach as Qiskit#91 as the file history is broken in the runtime repo, but since there were few enough files I used `git log --follow` to find the original PR and all authors that touched the files.

First part of #22 and #23. This copies over the open source files we plan to use in this repository. They are not actually used yet and still require some work like converting RST to MDX, but it gets the files and their Git history here to start the process.
Qiskit docs are placed in the folder
qiskit-docs/and Runtime docs inruntime-docs. These are only for unprocessed docs. Once a document is ready, we will move it to the officialdocs/folder and have it go live.This uses
git-filter-repoto preserve all the Git history and author attribution from the respective open source repositories. It uses the below Python script and this zipped folder, using an approach very similar to @jakelishman's original work in Qiskit/qiskit#10611.This PR has no additional commits. It solely copies over the other repositories into this one.
Migration script: