Commit 419c630d authored by Tobias Bonsen's avatar Tobias Bonsen
Browse files

Remove pydantic < v2.0 pin

parent 34e795f8

docs/source/examples/structure.DataStructure.rst

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ User may implement custom validators: 
.. jupyter-execute::

    :raises:



    from pydantic import validator

    from pydantic.v1 import validator





    class ScheduledExamplePulse(DataStructure):

docs/source/tutorials/qblox/Cluster (HardwareCompilationConfig).md

+8 −12
Original line number Diff line number Diff line
@@ -155,20 +155,18 @@ To compile to a Cluster, one should include a valid {class}`~.backends.types.qbl 
The name of the Cluster (the key of the structure, `"cluster0"` in the example) can be chosen freely.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.qblox.ClusterDescription

.. autoapiclass:: quantify_scheduler.backends.types.qblox.ClusterDescription

    :noindex:

    :members:

    :inherited-members: BaseModel

    :members: ref, sequence_to_file, instrument_type, modules



```



Here the modules are described by their respective {obj}`~.backends.types.qblox.ClusterModuleDescription`. For example, a QRM-RF module is described by



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.qblox.QRMRFDescription

.. autoapiclass:: quantify_scheduler.backends.types.qblox.QRMRFDescription

    :noindex:

    :members:

    :inherited-members: BaseModel



```
@@ -179,10 +177,9 @@ To use the default settings, one can omit the channel description from the {obj 
For a complex input/output, this datastructure is:



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.qblox.ComplexChannelDescription

.. autoapiclass:: quantify_scheduler.backends.types.qblox.ComplexChannelDescription

    :noindex:

    :members: 

    :inherited-members: BaseModel



```
@@ -675,10 +672,9 @@ schedule.add(MarkerPulse(duration=52e-9, port="q0:switch")) 
The {class}`~.backends.types.qblox.QbloxHardwareOptions` datastructure contains the settings used in compiling from the quantum-device layer to a set of instructions for the control hardware.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.qblox.QbloxHardwareOptions

.. autoapiclass:: quantify_scheduler.backends.types.qblox.QbloxHardwareOptions

    :noindex:

    :members: 

    :inherited-members: BaseModel

    :members: latency_corrections, distortion_corrections, modulation_frequencies, mixer_corrections, input_gain, output_att, input_att, sequencer_options



```
@@ -1058,7 +1054,7 @@ Several options are available that are set on the sequencer that is assigned to 
These can be set by adding `"sequencer_options"` to the hardware options.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.qblox.SequencerOptions

.. autoapiclass:: quantify_scheduler.backends.types.qblox.SequencerOptions

    :noindex:

    :members:

docs/source/tutorials/zhinst/index.md

+10 −15
Original line number Diff line number Diff line
@@ -103,26 +103,23 @@ See {ref}`the hardware verification tutorial <hardware-verfication-tutorial>` fo 
The {ref}`Hardware Description <sec-hardware-description>` describes the instruments that are used in the setup, along with some instrument-specific settings. The currently supported instruments are:



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.zhinst.ZIHDAWG4Description

.. autoapiclass:: quantify_scheduler.backends.types.zhinst.ZIHDAWG4Description

    :noindex:

    :members:

    :inherited-members: Datastructure, BaseModel

    :members: ref, instrument_type, channelgrouping, clock_select, channel_0, channel_1



```



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.zhinst.ZIHDAWG8Description

.. autoapiclass:: quantify_scheduler.backends.types.zhinst.ZIHDAWG8Description

    :noindex:

    :members:

    :inherited-members: BaseModel

    :members: ref, instrument_type, channelgrouping, clock_select, channel_0, channel_1, channel_2, channel_3



```



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.zhinst.ZIUHFQADescription

.. autoapiclass:: quantify_scheduler.backends.types.zhinst.ZIUHFQADescription

    :noindex:

    :members:

    :inherited-members: BaseModel

    :members: ref, instrument_type, channel_0



```
@@ -136,17 +133,16 @@ HardwareDescription map 1-to-1 to the names given to the QCodes Instrument durin 
The channels of these instruments are described by



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.zhinst.ZIChannelDescription

.. autoapiclass:: quantify_scheduler.backends.types.zhinst.ZIChannelDescription

    :noindex:

    :members:

    :inherited-members: BaseModel



```



Local oscillators can also be included by using the following generic datastructure.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.common.LocalOscillatorDescription

.. autoapiclass:: quantify_scheduler.backends.types.common.LocalOscillatorDescription

    :noindex:

    :members:
@@ -163,10 +159,9 @@ The {class}`~.backends.types.common.Connectivity` datastructure is currently und 
The {class}`~.backends.types.zhinst.ZIHardwareOptions` datastructure contains the settings used in compiling from the quantum-device layer to a set of instructions for the control hardware.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.zhinst.ZIHardwareOptions

.. autoapiclass:: quantify_scheduler.backends.types.zhinst.ZIHardwareOptions

    :noindex:

    :members:

    :inherited-members: BaseModel

    :members: latency_corrections, distortion_corrections, modulation_frequencies, mixer_corrections, output_gain



```

docs/source/user_guide.md

+9 −11
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ The scheduler supports multiple compilation steps, the most important ones are t 
The compilation is performed by a {class}`~.QuantifyCompiler`, which is configured through the {class}`~.CompilationConfig`:



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.graph_compilation.CompilationConfig

.. autoapiclass:: quantify_scheduler.backends.graph_compilation.CompilationConfig

    :noindex:

    :members: backend, device_compilation_config, hardware_compilation_config
@@ -362,7 +362,7 @@ The device compilation configuration is used to compile from the quantum-circuit 
This datastructure is auto-generated by the {class}`~.device_under_test.quantum_device.QuantumDevice` using the parameters stored in the {class}`~.device_under_test.device_element.DeviceElement`s.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.graph_compilation.DeviceCompilationConfig

.. autoapiclass:: quantify_scheduler.backends.graph_compilation.DeviceCompilationConfig

    :noindex:



```
@@ -380,7 +380,7 @@ The hardware compilation configuration is used to compile from the quantum-devic 
Currently, this datastructure is parsed from a user-defined dict that should be passed to the `quantum_device.hardware_config` parameter.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.common.HardwareCompilationConfig

.. autoapiclass:: quantify_scheduler.backends.types.common.HardwareCompilationConfig

    :noindex:

    :members:
@@ -411,10 +411,9 @@ There is a specific {obj}`~.backends.types.common.HardwareDescription` datastruc 
````{admonition} Example: Qblox ClusterDescription datastructure

:class: dropdown

```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.qblox.ClusterDescription

.. autoapiclass:: quantify_scheduler.backends.types.qblox.ClusterDescription

    :noindex:

    :members:

    :inherited-members: BaseModel

    :members: ref, sequence_to_file, instrument_type, modules



```

````
@@ -423,10 +422,9 @@ There is a specific {obj}`~.backends.types.common.HardwareDescription` datastruc 
````{admonition} Example: ZIHDAWG8Description datastructure

:class: dropdown

```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.zhinst.ZIHDAWG8Description

.. autoapiclass:: quantify_scheduler.backends.types.zhinst.ZIHDAWG8Description

    :noindex:

    :members:

    :inherited-members: BaseModel

    :members: ref, instrument_type, channelgrouping, clock_select, channel_0, channel_1, channel_2, channel_3



```

````
@@ -435,7 +433,7 @@ There is a specific {obj}`~.backends.types.common.HardwareDescription` datastruc 
````{admonition} Example: LocalOscillatorDescription datastructure

:class: dropdown

```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.common.LocalOscillatorDescription

.. autoapiclass:: quantify_scheduler.backends.types.common.LocalOscillatorDescription

    :noindex:

    :members:
@@ -448,7 +446,7 @@ There is a specific {obj}`~.backends.types.common.HardwareDescription` datastruc 
The {class}`~.backends.types.common.HardwareOptions` datastructure contains the settings used in compiling from the quantum-device layer to a set of instructions for the control hardware. Most hardware options are structured as `Dict[str, HardwareOption]`, where the keys are the port-clock combinations on which these settings should be applied.



```{eval-rst}

.. autoclass:: quantify_scheduler.backends.types.common.HardwareOptions

.. autoapiclass:: quantify_scheduler.backends.types.common.HardwareOptions

  :noindex:

  :members:

pyproject.toml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ dependencies = [ 
    "pandas[output_formatting]",

    "pathvalidate",

    "plotly",

    "pydantic<2.0",

    "pydantic",

    "qblox-instruments~=0.11.0", # Prevent upgrade upon minor release while allowing for installing patch releases

    "quantify_core>=0.6.5", # For deprecation hints shown to end-users by default

    "qcodes>=0.32.0", # 0.32.0: introduces InstrumentModule