Skip to content

Commit

Permalink
Merge remote-tracking branch 'ibm/main' into terra-nullius
Browse files Browse the repository at this point in the history
  • Loading branch information
jakelishman committed Nov 27, 2023
2 parents 2e986d7 + 89642bd commit 560c47a
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:
with:
python-version: '3.10'
- name: Install deps
run: pip install -U twine setuptools-rust wheel build
run: pip install -U build
- name: Build sdist
run: python -m build . --sdist
- name: Publish package distributions to PyPI
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ def test_method2(self):
self.assertEqual(result, <expected>)
```

`test_method1_deprecated` can be removed after `Obj.method1` is removed (following the [Qiskit Deprecation Policy](https://qiskit.org/documentation/contributing_to_qiskit.html#deprecation-policy)).
`test_method1_deprecated` can be removed after `Obj.method1` is removed (following the [Qiskit Deprecation Policy](./DEPRECATION.md)).

## Using dependencies

Expand Down
3 changes: 2 additions & 1 deletion qiskit/circuit/library/phase_estimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class PhaseEstimation(QuantumCircuit):
Cambridge University Press, New York, NY, USA.
[3]: Qiskit
`textbook <https://learn.qiskit.org/course/ch-algorithms/quantum-phase-estimation>`_
`textbook <https://github.com/Qiskit/textbook/blob/main/notebooks/ch-algorithms/
quantum-phase-estimation.ipynb>`_
"""

Expand Down
2 changes: 1 addition & 1 deletion qiskit/circuit/quantumcircuit.py
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ def tensor(self, other: "QuantumCircuit", inplace: bool = False) -> Optional["Qu
Remember that in the little-endian convention the leftmost operation will be at the bottom
of the circuit. See also
`the docs <qiskit.org/documentation/tutorials/circuits/3_summary_of_quantum_operations.html>`__
`the docs <https://docs.quantum-computing.ibm.com/build/circuit-construction>`__
for more information.
.. parsed-literal::
Expand Down
2 changes: 1 addition & 1 deletion qiskit/qasm3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
All features enabled by the experimental flags are naturally transient. If it becomes necessary
to remove flags, they will be subject to `the standard Qiskit deprecation policy
<https://qiskit.org/documentation/deprecation_policy.html>`__. We will leave these experimental
<https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md>`__. We will leave these experimental
flags in place for as long as is reasonable.
However, we cannot guarantee any support windows for *consumers* of OpenQASM 3 code generated
Expand Down
2 changes: 1 addition & 1 deletion qiskit/qpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
With the support of :class:`.~ScheduleBlock`, now :class:`~.QuantumCircuit` can be
serialized together with :attr:`~.QuantumCircuit.calibrations`, or
`Pulse Gates <https://qiskit.org/documentation/tutorials/circuits_advanced/05_pulse_gates.html>`_.
`Pulse Gates <https://docs.quantum-computing.ibm.com/build/pulse>`_.
In QPY version 5 and above, :ref:`qpy_circuit_calibrations` payload is
packed after the :ref:`qpy_instructions` block.
Expand Down
8 changes: 4 additions & 4 deletions qiskit/transpiler/passes/basis/basis_translator.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ def run(self, dag):
"target basis is not universal or there are additional equivalence rules "
"needed in the EquivalenceLibrary being used. For more details on this "
"error see: "
"https://qiskit.org/documentation/stubs/qiskit.transpiler.passes."
"BasisTranslator.html#translation_errors"
"https://docs.quantum-computing.ibm.com/api/qiskit/qiskit.transpiler.passes."
"BasisTranslator#translation-errors"
)

qarg_local_basis_transforms[qarg] = local_basis_transforms
Expand All @@ -220,8 +220,8 @@ def run(self, dag):
f"basis: {list(target_basis)}. This likely means the target basis is not universal "
"or there are additional equivalence rules needed in the EquivalenceLibrary being "
"used. For more details on this error see: "
"https://qiskit.org/documentation/stubs/qiskit.transpiler.passes.BasisTranslator."
"html#translation_errors"
"https://docs.quantum-computing.ibm.com/api/qiskit/qiskit.transpiler.passes."
"BasisTranslator#translation-errors"
)

# Compose found path into a set of instruction substitution rules.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ValidatePulseGates(AnalysisPass):
In Qiskit SDK, we can define the pulse-level implementation of custom quantum gate
instructions, as a `pulse gate
<https://qiskit.org/documentation/tutorials/circuits_advanced/05_pulse_gates.html>`__,
<https://docs.quantum-computing.ibm.com/build/pulse>`__,
thus user gates should satisfy all waveform memory constraints imposed by the backend.
This pass validates all attached calibration entries and raises ``TranspilerError`` to
Expand Down
2 changes: 1 addition & 1 deletion qiskit/utils/optionals.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<https://github.com/Qiskit/rustworkx>`__ library as a core dependency, and during the
change-over period, it was sometimes convenient to convert things into the Python-only
`NetworkX <https://networkx.org/>`__ format. Some tests of application modules, such as
`Qiskit Nature <https://qiskit.org/documentation/nature/>`__ still use NetworkX.
`Qiskit Nature <https://qiskit.org/ecosystem/nature/>`__ still use NetworkX.
* - .. py:data:: HAS_NLOPT
- `NLopt <https://nlopt.readthedocs.io/en/latest/>`__ is a nonlinear optimization library,
Expand Down

0 comments on commit 560c47a

Please sign in to comment.