Fix/remove qm-qua 1.2.0 deprecations (#223)

* Address QuantumMachine and QuantumMachinesManager deprecations in qm.qua==1.1.2

* Add changes to CHANGELOG.

* Fix import for QmJob.

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
+### Fixed
+- Fix deprecated imports in preparation for qm-qua version 1.2.0
 
 ## [0.17.5] - 2024-06-26
 ### Fixed

examples/callable_from_qua/feedback_on_external_instrument.py

@@ -1,5 +1,5 @@
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from time import sleep
 from configuration import *
 from qualang_tools.callable_from_qua import *

examples/callable_from_qua/qua_print.py

@@ -1,5 +1,5 @@
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from configuration import *
 from qualang_tools.callable_from_qua import callable_from_qua, patch_qua_program_addons
 

examples/callable_from_qua/update_other_instruments.py

@@ -1,5 +1,5 @@
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from configuration import *
 from qualang_tools.callable_from_qua import *
 from qualang_tools.loops import from_array

qualang_tools/addons/calibration/README.md

@@ -30,7 +30,7 @@ Several options are also available for customizing the plots. All of them are wr
 
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qualang_tools.addons.calibration.calibrations import *
 from configuration import * 
 

qualang_tools/addons/calibration/calibrations.py

@@ -3,8 +3,8 @@
 """
 
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachinesManager
+from qm import QuantumMachine
 from qualang_tools.plot import interrupt_on_close
 from qualang_tools.results import progress_counter, fetching_tool
 from qualang_tools.units import unit

qualang_tools/callable_from_qua/_callable_from_qua.py

@@ -3,11 +3,11 @@
 from time import sleep
 from typing import List, Any, Dict
 from functools import wraps
-from qm.QmJob import QmJob
+from qm import QmJob
 from qm.program import Program
 from qm.qua import declare_stream, save, pause
 from qm.exceptions import QmQuaException
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachine
 from qm.qua._dsl import _ResultSource, _Variable, align, _get_root_program_scope
 
 __all__ = ["ProgramAddon", "callable_from_qua"]

qualang_tools/callable_from_qua/_qua_patches.py

@@ -5,7 +5,7 @@
 
 from qm.program import Program
 from qm.qua._dsl import _ProgramScope as _ProgramScope_qua
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachine
 from qm.simulate.interface import SimulationConfig
 
 

qualang_tools/control_panel/manual_output_control.py

@@ -6,8 +6,8 @@
 
 import numpy as np
 from qm import QuantumMachine
-from qm.QmJob import QmJob
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QmJob
+from qm import QuantumMachinesManager
 from qm.qua import *
 
 

qualang_tools/control_panel/vna.py

@@ -1,7 +1,7 @@
 """calling function libraries"""
 
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 import numpy as np
 import matplotlib.pyplot as plt
 

qualang_tools/external_frameworks/qcodes/opx_driver.py

@@ -9,7 +9,7 @@
 from qcodes.utils.validators import Numbers, Arrays
 from qm import SimulationConfig, generate_qua_script
 from qm.qua import program
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qualang_tools.results import wait_until_job_is_paused
 from qualang_tools.results import fetching_tool
 from qualang_tools.plot import interrupt_on_close

qualang_tools/multi_user/README.md

@@ -17,8 +17,8 @@ for another user.
 Note: `host`, `config` and `prog` are assumed to be supplied by user.
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
-from qm.QmJob import QmJob
+from qm import QuantumMachinesManager
+from qm import QmJob
 from qualang_tools.multi_user import qm_session
 qmm = QuantumMachinesManager(host)
 

qualang_tools/multi_user/multi_user_tools.py

@@ -3,7 +3,7 @@
 from time import sleep
 
 from qm import QuantumMachine
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 
 msg = (
     "A quantum machine cannot be opened because an existing quantum machine, using the same ports, is currently "

qualang_tools/octave_tools/octave_tools.py

@@ -1,9 +1,9 @@
 import numpy as np
 from qm.octave.calibration_db import CalibrationDB
 from typing import Union
-from qm.QmJob import QmJob
+from qm import QmJob
 from qm.jobs.running_qm_job import RunningQmJob
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachine
 from qm.octave.octave_mixer_calibration import AutoCalibrationParams
 
 

qualang_tools/plot/README.md

@@ -7,7 +7,7 @@ This function allows to interrupt the execution and free the console when closin
 ### Usage example
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qualang_tools.plot import interrupt_on_close
 from qm.qua import *
 import matplotlib.pyplot as plt
@@ -56,7 +56,7 @@ This function gets the samples generated from the QUA simulator by element.
 ### Usage example
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qm import SimulationConfig
 from qm.qua import *
 from configuration import config
@@ -80,7 +80,7 @@ This function plots the samples generated from the QUA simulator by element usin
 ### Usage example
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qm import SimulationConfig
 from qm.qua import *
 from configuration import config

qualang_tools/plot/plot.py

@@ -9,7 +9,7 @@
 from scipy import signal
 import plotly.graph_objects as go
 from matplotlib import pyplot as plt
-from qm.QmJob import QmJob
+from qm import QmJob
 from qualang_tools.plot.fitting import *
 
 

tests_against_server/test_bakery_server.py

@@ -1,7 +1,7 @@
 import matplotlib.pyplot as plt
 import pytest
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qm import SimulationConfig
 import numpy as np
 from qualang_tools.bakery.bakery import baking

tests_against_server/test_loops.py

@@ -1,7 +1,7 @@
 import pytest
 from qualang_tools.loops import *
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from copy import deepcopy
 import numpy as np
 

tests_against_server/test_multi_user.py

@@ -1,7 +1,7 @@
 import pytest
 import numpy as np
-from qm.QuantumMachinesManager import QuantumMachinesManager
-from qm.QmJob import QmJob
+from qm import QuantumMachinesManager
+from qm import QmJob
 from qm.qua import *
 from qualang_tools.multi_user import qm_session