Skip to content

Commit

Permalink
Merge branch 'main' into move-target
Browse files Browse the repository at this point in the history
  • Loading branch information
raynelfss authored May 22, 2024
2 parents bf1fa67 + 8e3218b commit ae55a38
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 0 additions & 6 deletions qiskit/providers/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ def __init__(self, configuration, provider=None, **fields):
This next bit is necessary just because autosummary generally won't summarise private
methods; changing that behaviour would have annoying knock-on effects through all the
rest of the documentation, so instead we just hard-code the automethod directive.
In addition to the public abstract methods, subclasses should also implement the following
private methods:
.. automethod:: _default_options
:noindex:
"""
self._configuration = configuration
self._options = self._default_options()
Expand Down
4 changes: 2 additions & 2 deletions qiskit/pulse/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
The builder initializes a :class:`.pulse.Schedule`, ``pulse_prog``
and then begins to construct the program within the context. The output pulse
schedule will survive after the context is exited and can be transpiled and executed like a
normal Qiskit schedule using ``backend.run(transpile(pulse_prog, backend))``.
schedule will survive after the context is exited and can be used like a
normal Qiskit schedule.
Pulse programming has a simple imperative style. This leaves the programmer
to worry about the raw experimental physics of pulse programming and not
Expand Down

0 comments on commit ae55a38

Please sign in to comment.