Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

Commit 273e69b

Browse files
committed
Merge remote-tracking branch 'upstream/master' into update-pulse-software-documentation
2 parents 3e2a5f0 + 82d6995 commit 273e69b

60 files changed

Lines changed: 9585 additions & 23509 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ Because the tutorials are executed as part of the build process, and eventually
4646
## I am another secondary header
4747
```
4848
49-
4. In order for a tutorial to show up in the Qiskit documentation, after successful merging, an additional PR needs to be made in the [Qiskit meta-repo](https://github.com/Qiskit/qiskit) to trigger the rebuilding of the documentation.
49+
4. All math equations expressed using `$$ ... $$` need to be surrounded on top and bottom by white space.
50+
51+
5. In order for a tutorial to show up in the Qiskit documentation, after successful merging, an additional PR needs to be made in the [Qiskit meta-repo](https://github.com/Qiskit/qiskit) to trigger the rebuilding of the documentation.
5052
5153
### Adding a gallery image
5254

azure-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ steps:
3737
virtualenv /tmp/docs_build
3838
source /tmp/docs_build/bin/activate
3939
pip install -U qiskit jupyter sphinx nbsphinx sphinx_rtd_theme
40-
pip install -U qiskit-terra[visualization] cvxpy
40+
pip install 'matplotlib<3.3'
41+
pip install -U qiskit[visualization] cvxpy
4142
sudo apt-get install -y pandoc graphviz
4243
displayName: 'Install dependencies'
4344
- bash: |

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Qiskitenv
22
dependencies:
33
- python>=3.6
4-
- matplotlib
4+
- matplotlib<3.3
55
- notebook
66
- ipywidgets
77
- pip:

legacy_tutorials/aer/8_pulse_simulator_duffing_model.ipynb

Lines changed: 0 additions & 910 deletions
This file was deleted.

legacy_tutorials/aer/9_pulse_simulator_from_backend.ipynb

Lines changed: 0 additions & 485 deletions
This file was deleted.

legacy_tutorials/aqua/evolutionfidelity/evolutionfidelity/__init__.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

legacy_tutorials/aqua/evolutionfidelity/evolutionfidelity/evolutionfidelity.py

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)