Skip to content

Commit 0bbd426

Browse files
authored
Add patch release notes and docs fixes (#1412)
### Summary Closes #1401. Our release notes currently doesn't include notes of the patch releases before the most recent minor release. This PR updates `release_notes.rst` to build previous patch releases (0.3.1 isn't rendering but I think it's too old to be useful now anyways). The new process prior to release is that release notes from the most recent minor version's patch releases should be deleted from the main branch prior to a new minor release, and `release_notes.rst` needs to have a new directive added for the previous stable branch. ### Details and comments A few other minor changes: - Wraps the output text of jupyter-sphinx blocks - Update the contributor guide to include release note subcategories - Suppress the debugger warning during the docs build by setting `PYDEVD_DISABLE_FILE_VALIDATION=1` - Add a link to the main branch to the dev docs banner -
1 parent aa3b54f commit 0bbd426

17 files changed

+34
-87
lines changed

.github/workflows/docs_stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Build docs stable
2626
env:
2727
QISKIT_DOCS_BUILD_TUTORIALS: 'always'
28-
run: EXPERIMENTS_DEV_DOCS=1 PROD_BUILD=1 tox -e docs
28+
run: PROD_BUILD=1 tox -e docs
2929
- name: Bypass Jekyll Processing # Necessary for setting the correct css path
3030
run: touch docs/_build/html/.nojekyll
3131
- name: Set current version

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ you aren't using and update the contents for those you are. For example, the end
241241
should look something like:
242242

243243
```yaml
244-
features:
244+
features_expclass:
245245
- |
246246
Introduced a new feature foo that adds support for doing something to
247247
:class:`~qiskit.circuit.QuantumCircuit` objects. It can be used by using the foo function,
@@ -272,7 +272,10 @@ deprecations:
272272
:func:`qiskit.bar.foobar` calls to :func:`qiskit.foo`.
273273
```
274274
275-
You can also look at existing release notes for more examples.
275+
Note that we are using subsections within the `features`, `upgrade`, and `fixes` sections to
276+
organize the notes by functional area. We strongly encourage you to file your note under the most
277+
appropriate category. You can see the current list of categories in
278+
[release_notes/config.yaml](https://github.com/Qiskit-Extensions/qiskit-experiments/blob/main/releasenotes/config.yaml).
276279

277280
You can use any restructured text feature in them (code sections, tables, enumerated
278281
lists, bulleted list, etc.) to express what is being changed as needed. In general, you

docs/_static/dataframe.css renamed to docs/_static/customstyles.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/* Wrap text of jupyter-sphinx output blocks */
2+
3+
div.output pre{
4+
white-space: pre-wrap;
5+
}
6+
17
/* Styling for pandas dataframes in documentation */
28

39
div.output table {

docs/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
templates_path = ["_templates"]
8181
# Manually add the gallery CSS file for now
8282
# TODO: Figure out why the styling is not working by default
83-
html_css_files = ["nbsphinx-gallery.css", "dataframe.css"]
83+
html_css_files = ["nbsphinx-gallery.css", "customstyles.css"]
8484

8585
nbsphinx_timeout = 360
8686
nbsphinx_execute = os.getenv("QISKIT_DOCS_BUILD_TUTORIALS", "never")
@@ -176,7 +176,8 @@
176176
if os.getenv("EXPERIMENTS_DEV_DOCS", None):
177177
rst_prolog = """
178178
.. note::
179-
This is the documentation for the current state of the development branch
179+
This is the documentation for the current state of the `development branch
180+
<https://github.com/Qiskit-Extensions/qiskit-experiments/tree/main>`_
180181
of Qiskit Experiments. The documentation or APIs here can change prior to being
181182
released.
182183
"""

docs/release_notes.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
.. release-notes:: Release Notes
1+
=============
2+
Release Notes
3+
=============
4+
5+
.. release-notes::
6+
:earliest-version: 0.6.0
7+
8+
.. release-notes::
9+
:branch: stable/0.5

docs/tutorials/visualization.rst

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ The plotter that generated the figure can be accessed through the analysis insta
7878
and customizing the figure can be done by setting the plotter's options. We now modify
7979
the color, symbols, and size of our plot, as well as change the axis labels for the amplitude units:
8080

81-
.. jupyter-execute::
82-
:hide-code:
83-
:hide-output:
84-
85-
%matplotlib inline
86-
8781
.. jupyter-execute::
8882

8983
# Retrieve the plotter from the analysis instance
@@ -185,7 +179,7 @@ were styled differently according to the ``series_params`` attribute of ``figure
185179

186180
By default, the supported figure options are ``xlabel``, ``ylabel``, ``xlim``, ``ylim``,
187181
``xval_unit``, ``yval_unit``, ``xval_unit_scale``, ``yval_unit_scale``, ``xscale``, ``yscale``,
188-
``figure_title``, and ``series_params``; see `:class:.MplDrawer` for details on how to set these
182+
``figure_title``, and ``series_params``; see :class:`.MplDrawer` for details on how to set these
189183
options. The following T1 experiment provides examples to options that have not been demonstrated
190184
until now in this tutorial:
191185

qiskit_experiments/framework/base_analysis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def _run_analysis(
256256
257257
Returns:
258258
A pair ``(analysis_results, figures)`` where ``analysis_results``
259-
is a list of :class:`AnalysisResultData` objects, and ``figures``
259+
is a list of :class:`.AnalysisResultData` objects, and ``figures``
260260
is a list of any figures for the experiment.
261261
262262
Raises:

releasenotes/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ default_branch: main
44
sections:
55
- [features, New Features, 1]
66
- [features_expnew, New Experiments, 2]
7-
- [features_explib, Experiment Library Updates, 2]
7+
- [features_explib, Experiment Library Features, 2]
88
- [features_expclass, Experiment Class Features, 2]
99
- [features_analysis, Analysis Class Features, 2]
1010
- [features_expdata, Experiment Data Features, 2]

releasenotes/notes/0.6/attach-other-cals-2f539e7799ceb6c8.yaml

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

releasenotes/notes/0.6/backend-in-rough-frequency-cal-8582610249e2327b.yaml

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

0 commit comments

Comments
 (0)