Merge pull request #373 from qiboteam/zcu111-server

qiboteam · Jun 5, 2023 · 4767ca5 · 4767ca5
2 parents 8d0d5b2 + 8ce266a
commit 4767ca5
Show file tree

Hide file tree

Showing 6 changed files with 879 additions and 731 deletions.
diff --git a/doc/source/api-reference/qibolab.rst b/doc/source/api-reference/qibolab.rst
@@ -277,10 +277,10 @@ IcarusQFPGA
    :members:
    :member-order: bysource
 
-RFSoC 4x2
----------
+RFSoC
+-----
 
-.. autoclass:: qibolab.instruments.rfsoc.TII_RFSOC4x2
+.. autoclass:: qibolab.instruments.rfsoc.RFSoC
    :members:
    :member-order: bysource
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,13 +26,16 @@ qibo = "^0.1.12"
 networkx = "^3.0"
 more-itertools = "^9.1.0"
 pyyaml = "^6.0"
-qblox-instruments = { version = "0.9.0", optional = true }
+qblox-instruments = { version = "0.9.0", optional = true}
 qcodes = { version = "^0.37.0", optional = true }
-qcodes_contrib_drivers = { version = "0.18.0", optional = true }
+qcodes_contrib_drivers = { version ="0.18.0", optional = true }
 pyvisa-py = { version = "0.5.3", optional = true }
 qm-qua = { version = "==1.1.1", optional = true }
-qualang-tools = { version = "==0.14.0", optional = true }
-laboneq = {  version ="==2.5.0", optional = true  }
+qualang-tools = { version = "==0.14.0", optional = true}
+setuptools = { version = ">67.0.0", optional = true }
+laboneq = { version ="==2.5.0", optional = true }
+# TODO change qibosoq when release
+qibosoq = { git = "https://github.com/qiboteam/qibosoq.git", branch = "main", optional = true}
 
 [tool.poetry.group.docs]
 optional = true
@@ -63,8 +66,9 @@ pylint = ">=2.16.0"
 
 [tool.poetry.extras]
 qblox = ["qblox-instruments", "qcodes", "qcodes_contrib_drivers", "pyvisa-py"]
-qm = ["qm-qua", "qualang-tools"]
+qm = ["qm-qua", "qualang-tools", "setuptools"]
 zh = ["laboneq"]
+rfsoc = ["qibosoq", "qcodes", "qcodes_contrib_drivers"]
 
 
 [tool.poe.tasks]