From e42cb1a03a26d85203d4df8083cf3285c4b4e925 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Tue, 22 Dec 2020 08:50:35 +0100 Subject: [PATCH 1/7] remove duplicated documentation of attributes --- qcodes/instrument/channel.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/qcodes/instrument/channel.py b/qcodes/instrument/channel.py index 1d650914cc0..d880f556f9e 100644 --- a/qcodes/instrument/channel.py +++ b/qcodes/instrument/channel.py @@ -22,13 +22,6 @@ class InstrumentChannel(InstrumentBase): name: The name of this channel. - Attributes: - - parameters (Dict[Parameter]): All the parameters supported by this - channel. Usually populated via ``add_parameter``. - - functions (Dict[Function]): All the functions supported by this - channel. Usually populated via ``add_function``. """ def __init__(self, From eb946b3bc3e651bdad87b16d804e2d8e6c680fef Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Fri, 25 Dec 2020 11:26:38 +0100 Subject: [PATCH 2/7] Bump sphinx to 3.4.1 --- science_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science_requirements.txt b/science_requirements.txt index b1cb299547a..c879593fe17 100644 --- a/science_requirements.txt +++ b/science_requirements.txt @@ -91,7 +91,7 @@ rope==0.18.0 six==1.15.0 snowballstemmer==2.0.0 sortedcontainers==2.3.0 -Sphinx==3.3.1 +Sphinx==3.4.1 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==1.0.3 From 68b2765ee8ac8ca90c2ebc451a555f64b9f54509 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Fri, 25 Dec 2020 11:28:12 +0100 Subject: [PATCH 3/7] bump sphinx in reqirementes --- docs_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs_requirements.txt b/docs_requirements.txt index ae541daaca8..cd860dc1473 100644 --- a/docs_requirements.txt +++ b/docs_requirements.txt @@ -64,7 +64,7 @@ scipy==1.5.4 Send2Trash==1.5.0 six==1.15.0 snowballstemmer==2.0.0 -Sphinx==3.3.1 +Sphinx==3.4.1 sphinx-jsonschema==1.16.6 sphinx-rtd-theme==0.5.0 sphinxcontrib-applehelp==1.0.2 From befe6e00d45865589e2bb11eae503a5e1ecc4fc5 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 4 Jan 2021 14:25:52 +0100 Subject: [PATCH 4/7] Sphinx 3.4.2 --- docs_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs_requirements.txt b/docs_requirements.txt index cd860dc1473..6712b281001 100644 --- a/docs_requirements.txt +++ b/docs_requirements.txt @@ -64,7 +64,7 @@ scipy==1.5.4 Send2Trash==1.5.0 six==1.15.0 snowballstemmer==2.0.0 -Sphinx==3.4.1 +Sphinx==3.4.2 sphinx-jsonschema==1.16.6 sphinx-rtd-theme==0.5.0 sphinxcontrib-applehelp==1.0.2 From 130620eab617fa7dced2e8fc08945a033769c347 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 4 Jan 2021 14:26:21 +0100 Subject: [PATCH 5/7] Sphinx 3.4.2 --- science_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science_requirements.txt b/science_requirements.txt index c879593fe17..868f0717cbe 100644 --- a/science_requirements.txt +++ b/science_requirements.txt @@ -91,7 +91,7 @@ rope==0.18.0 six==1.15.0 snowballstemmer==2.0.0 sortedcontainers==2.3.0 -Sphinx==3.4.1 +Sphinx==3.4.2 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==1.0.3 From 13cef6ff46c6059f6ef27b02eac571c6137fdb78 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 5 Jan 2021 16:39:33 +0100 Subject: [PATCH 6/7] Revert to sphinx 3.4.1 --- docs_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs_requirements.txt b/docs_requirements.txt index 5548de3c0c5..a420a15139c 100644 --- a/docs_requirements.txt +++ b/docs_requirements.txt @@ -64,7 +64,7 @@ scipy==1.6.0 Send2Trash==1.5.0 six==1.15.0 snowballstemmer==2.0.0 -Sphinx==3.4.2 +Sphinx==3.4.1 sphinx-jsonschema==1.16.6 sphinx-rtd-theme==0.5.1 sphinxcontrib-applehelp==1.0.2 From 3acaa3671ad4752ced31301810474493366bf307 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 5 Jan 2021 16:39:56 +0100 Subject: [PATCH 7/7] revert to sphinx 3.4.1 --- science_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science_requirements.txt b/science_requirements.txt index a7d07bf4ba8..410600d1715 100644 --- a/science_requirements.txt +++ b/science_requirements.txt @@ -91,7 +91,7 @@ rope==0.18.0 six==1.15.0 snowballstemmer==2.0.0 sortedcontainers==2.3.0 -Sphinx==3.4.2 +Sphinx==3.4.1 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==1.0.3