Skip to content

Commit

Permalink
Add patch release notes and docs fixes (qiskit-community#1412)
Browse files Browse the repository at this point in the history
### Summary

Closes qiskit-community#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
-
  • Loading branch information
coruscating authored Feb 19, 2024
1 parent aa3b54f commit 0bbd426
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Build docs stable
env:
QISKIT_DOCS_BUILD_TUTORIALS: 'always'
run: EXPERIMENTS_DEV_DOCS=1 PROD_BUILD=1 tox -e docs
run: PROD_BUILD=1 tox -e docs
- name: Bypass Jekyll Processing # Necessary for setting the correct css path
run: touch docs/_build/html/.nojekyll
- name: Set current version
Expand Down
7 changes: 5 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ you aren't using and update the contents for those you are. For example, the end
should look something like:

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

You can use any restructured text feature in them (code sections, tables, enumerated
lists, bulleted list, etc.) to express what is being changed as needed. In general, you
Expand Down
6 changes: 6 additions & 0 deletions docs/_static/dataframe.css → docs/_static/customstyles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/* Wrap text of jupyter-sphinx output blocks */

div.output pre{
white-space: pre-wrap;
}

/* Styling for pandas dataframes in documentation */

div.output table {
Expand Down
5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
templates_path = ["_templates"]
# Manually add the gallery CSS file for now
# TODO: Figure out why the styling is not working by default
html_css_files = ["nbsphinx-gallery.css", "dataframe.css"]
html_css_files = ["nbsphinx-gallery.css", "customstyles.css"]

nbsphinx_timeout = 360
nbsphinx_execute = os.getenv("QISKIT_DOCS_BUILD_TUTORIALS", "never")
Expand Down Expand Up @@ -176,7 +176,8 @@
if os.getenv("EXPERIMENTS_DEV_DOCS", None):
rst_prolog = """
.. note::
This is the documentation for the current state of the development branch
This is the documentation for the current state of the `development branch
<https://github.com/Qiskit-Extensions/qiskit-experiments/tree/main>`_
of Qiskit Experiments. The documentation or APIs here can change prior to being
released.
"""
Expand Down
10 changes: 9 additions & 1 deletion docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
.. release-notes:: Release Notes
=============
Release Notes
=============

.. release-notes::
:earliest-version: 0.6.0

.. release-notes::
:branch: stable/0.5
8 changes: 1 addition & 7 deletions docs/tutorials/visualization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ The plotter that generated the figure can be accessed through the analysis insta
and customizing the figure can be done by setting the plotter's options. We now modify
the color, symbols, and size of our plot, as well as change the axis labels for the amplitude units:

.. jupyter-execute::
:hide-code:
:hide-output:

%matplotlib inline

.. jupyter-execute::

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

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

Expand Down
2 changes: 1 addition & 1 deletion qiskit_experiments/framework/base_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def _run_analysis(
Returns:
A pair ``(analysis_results, figures)`` where ``analysis_results``
is a list of :class:`AnalysisResultData` objects, and ``figures``
is a list of :class:`.AnalysisResultData` objects, and ``figures``
is a list of any figures for the experiment.
Raises:
Expand Down
2 changes: 1 addition & 1 deletion releasenotes/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ default_branch: main
sections:
- [features, New Features, 1]
- [features_expnew, New Experiments, 2]
- [features_explib, Experiment Library Updates, 2]
- [features_explib, Experiment Library Features, 2]
- [features_expclass, Experiment Class Features, 2]
- [features_analysis, Analysis Class Features, 2]
- [features_expdata, Experiment Data Features, 2]
Expand Down
12 changes: 0 additions & 12 deletions releasenotes/notes/0.6/attach-other-cals-2f539e7799ceb6c8.yaml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions releasenotes/notes/0.6/irb-circuit-order-619845a707519c44.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions releasenotes/notes/0.6/matplotlib-fix-58d938b49771cf17.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions releasenotes/notes/0.6/rb-v2-none-coupling-fda2b22afdef507b.yaml

This file was deleted.

This file was deleted.

7 changes: 7 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ passenv =
deps =
{[testenv]deps}
pyarrow
setenv =
PYDEVD_DISABLE_FILE_VALIDATION = 1
commands =
sphinx-build -T -W --keep-going -b html {posargs} docs/ docs/_build/html

Expand All @@ -85,6 +87,8 @@ passenv =
deps =
{[testenv]deps}
pyarrow
setenv =
PYDEVD_DISABLE_FILE_VALIDATION = 1
commands =
sphinx-build -j auto -T -W --keep-going -b html {posargs} docs/ docs/_build/html

Expand All @@ -100,6 +104,7 @@ deps =
pyarrow
setenv =
QISKIT_DOCS_SKIP_EXECUTE = 1
PYDEVD_DISABLE_FILE_VALIDATION = 1
commands =
sphinx-build -T -W --keep-going -b html {posargs} docs/ docs/_build/html

Expand All @@ -114,6 +119,8 @@ deps =
{[testenv]deps}
git+https://github.com/Qiskit/qiskit
pyarrow
setenv =
PYDEVD_DISABLE_FILE_VALIDATION = 1
commands =
sphinx-build -j auto -T -W --keep-going -b html {posargs} docs/ docs/_build/html

Expand Down

0 comments on commit 0bbd426

Please sign in to comment.