Fix conflicts

qiboteam · Dec 19, 2023 · 1d2f7a5 · 1d2f7a5
2 parents 72db04c + f9dc958
commit 1d2f7a5
Show file tree

Hide file tree

Showing 132 changed files with 2,738 additions and 2,199 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,7 +69,9 @@ instance/
 .scrapy
 
 # Sphinx documentation
-docs/_build/
+doc/_build/
+doc/source/api-reference/
+
 
 # PyBuilder
 target/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,11 +11,11 @@ repos:
       - id: check-merge-conflict
       - id: debug-statements
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 23.11.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.1
     hooks:
       - id: isort
         args: ["--profile", "black"]
@@ -24,7 +24,7 @@ repos:
     hooks:
       - id: pyupgrade
   - repo: https://github.com/hadialqattan/pycln
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
       - id: pycln
         args:

diff --git a/doc/source/api-reference/modules.rst b/doc/source/api-reference/modules.rst
@@ -3,7 +3,7 @@
 API reference
 =============
 
-In this section we present the main Qibolab components and primitives included in the public API.
+In this section we present the main qibocal components and primitives included in the public API.
 
 
 .. toctree::

diff --git a/doc/source/api-reference/qibocal.auto.rst b/doc/source/api-reference/qibocal.auto.rst
diff --git a/doc/source/api-reference/qibocal.cli.rst b/doc/source/api-reference/qibocal.cli.rst
diff --git a/doc/source/api-reference/qibocal.protocols.characterization.allxy.rst b/doc/source/api-reference/qibocal.protocols.characterization.allxy.rst
diff --git a/doc/source/api-reference/qibocal.protocols.characterization.coherence.rst b/doc/source/api-reference/qibocal.protocols.characterization.coherence.rst
diff --git a/doc/source/api-reference/qibocal.protocols.characterization.flux_dependence.rst b/doc/source/api-reference/qibocal.protocols.characterization.flux_dependence.rst
diff --git a/doc/source/api-reference/qibocal.protocols.characterization.rabi.rst b/doc/source/api-reference/qibocal.protocols.characterization.rabi.rst
diff --git a/...ce/api-reference/qibocal.protocols.characterization.randomized_benchmarking.rst b/...ce/api-reference/qibocal.protocols.characterization.randomized_benchmarking.rst