Merge pull request #2560 from jenshnielsen/sphinx_340_support

microsoft · Jan 5, 2021 · c604631 · c604631
2 parents 08d5e8b + 3acaa36
commit c604631
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git 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.3.1
+Sphinx==3.4.1
 sphinx-jsonschema==1.16.6
 sphinx-rtd-theme==0.5.1
 sphinxcontrib-applehelp==1.0.2

diff --git 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,

diff --git 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