Skip to content

Manual merge master to dev #1688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josh146 merged 2 commits into from
Feb 10, 2026
Merged

Manual merge master to dev #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49e7865
Pin qiskit, install demo requirements last (#1687)
doctorperceptron Feb 10, 2026
da7df6e
Merge branch 'dev' into master
doctorperceptron Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions demonstrations_v2/adjoint_diff_benchmarking/requirements.in
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions demonstrations_v2/ahs_aquila/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
jax
jaxlib
amazon-braket-sdk
amazon-braket-pennylane-plugin
1 change: 0 additions & 1 deletion demonstrations_v2/gbs/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
scipy
thewalrus
1 change: 0 additions & 1 deletion demonstrations_v2/ml_classical_shadows/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
networkx
neural_tangents==0.6.2
scipy
scikit-learn
3 changes: 0 additions & 3 deletions demonstrations_v2/oqc_pulse/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/qnspsa/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
amazon-braket-sdk
amazon-braket-pennylane-plugin
networkx
scipy
1 change: 0 additions & 1 deletion demonstrations_v2/qrack/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
pennylane-catalyst
pyqrack==1.32.12
3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_How_to_optimize_QML_model_using_JAX_and_JAXopt/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_How_to_optimize_QML_model_using_JAX_and_Optax/requirements.in
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...ations_v2/tutorial_How_to_optimize_QML_model_using_JAX_catalyst_and_Optax/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_adaptive_circuits/requirements.in
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_adjoint_diff/requirements.in
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_backprop/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_chemical_reactions/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
optax
openfermionpyscf
2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_classically_boosted_vqe/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_contextuality/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
jax
jaxlib
optax
tqdm
3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_eqnn_force_field/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
jax
jaxlib
scipy
scikit-learn
3 changes: 0 additions & 3 deletions ...s_v2/tutorial_fixed_depth_hamiltonian_simulation_via_cartan_decomposition/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_gaussian_transformation/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_general_parshift/requirements.in
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_givens_rotations/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_haar_measure/requirements.in
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_here_comes_the_sun/requirements.in
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions demonstrations_v2/tutorial_how_to_quantum_just_in_time_compile_vqe_catalyst/requirements.in
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions demonstrations_v2/tutorial_huang_geometric_kernel_difference/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
pennylane
scikit-learn
numpy
matplotlib
scipy
3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_implicit_diff_susceptibility/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_initial_state_preparation/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
pyscf
optax
2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_jax_transformations/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_learning_dynamics_incoherently/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_learning_few_data/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
jax
jaxlib
optax
pandas
seaborn==0.13.2
scikit-learn
3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_learningshallow/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_liesim/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_liesim_extension/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_magic_state_distillation/requirements.in
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_mitigation_advantage/requirements.in
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_neutral_atoms/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_noisy_circuits/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_odegen/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_optimal_control/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_photonics/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_post-variational_quantum_neural_networks/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
jax
jaxlib
optax
scikit-learn
3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_pulse_programming101/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_qcbm/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_qft/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_qgrnn/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
networkx
scipy
1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_qksd_qsp_qualtran/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ qualtran
# 1.7.1 added NumPy 2.x support
openfermion>=1.7.1
openfermionpyscf
scipy
# Conflicts between numba and numpy.
# Revisit this constraint once numba supports numpy 2.4.
numba>0.55
3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_qnn_multivariate_regression/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
jax
jaxlib
optax
scikit-learn
3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_quantum_dropout/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
jax
jaxlib
optax
scikit-learn
2 changes: 0 additions & 2 deletions demonstrations_v2/tutorial_quantum_gans/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
pandas
torch
torchvision
jax
jaxlib
1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_quantum_natural_gradient/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_qubit_rotation/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_qubit_tapering/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_rl_pulse/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
flax==0.10.6
optax
qutip
1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_rosalin/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_shadow_hamiltonian_simulation/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_stochastic_parameter_shift/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_trapped_ions/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_unitary_designs/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_vqe/requirements.in
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_vqe_spin_sectors/requirements.in
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions demonstrations_v2/tutorial_vqe_vqd/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
jax
jaxlib
optax
torch
1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_vqt/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
networkx
scipy
seaborn==0.13.2
1 change: 0 additions & 1 deletion demonstrations_v2/tutorial_xas/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
pyscf
optax
1 change: 1 addition & 0 deletions dependencies/constraints-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ aiohttp==3.9.5
fastapi<1.0.0
fsspec==2024.6.1
h5py==3.11.0
ibm-platform-services>=0.73
ipython==8.16.1

chex<1.0.0
Expand Down
3 changes: 2 additions & 1 deletion dependencies/requirements-core.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ fsspec
h5py
jax
jaxlib
jaxopt
matplotlib
optax
pennylane-catalyst
pennylane-lightning
pennylane
optax
10 changes: 10 additions & 0 deletions lib/qml/lib/demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,16 @@ def _build_demo(
quiet=False,
pre=True,
)
# If there are demo-specific constraints, we need
# to reinstall them now in case PLC dev versions wiped them out.
if demo.requirements_file:
cmds.pip_install(
build_venv.python,
"--upgrade",
requirements=demo.requirements_file,
quiet=False,
pre=False,
)

elif dev:
# Need latest version of PennyLane to build, whether or not we're executing
Expand Down
Loading