Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build docs with Sphinx 3.4.1 #2560

Merged
merged 9 commits into from
Jan 5, 2021
Merged

Build docs with Sphinx 3.4.1 #2560

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e42cb1a
remove duplicated documentation of attributes
jenshnielsen Dec 22, 2020
eb946b3
Bump sphinx to 3.4.1
jenshnielsen Dec 25, 2020
68b2765
bump sphinx in reqirementes
jenshnielsen Dec 25, 2020
befe6e0
Sphinx 3.4.2
jenshnielsen Jan 4, 2021
130620e
Sphinx 3.4.2
jenshnielsen Jan 4, 2021
19ad819
Merge branch 'master' into sphinx_340_support
jenshnielsen Jan 4, 2021
eb3218e
Merge branch 'master' into sphinx_340_support
astafan8 Jan 5, 2021
13cef6f
Revert to sphinx 3.4.1
jenshnielsen Jan 5, 2021
3acaa36
revert to sphinx 3.4.1
jenshnielsen Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
sphinx-jsonschema==1.16.6
sphinx-rtd-theme==0.5.0
sphinxcontrib-applehelp==1.0.2
Expand Down
7 changes: 0 additions & 7 deletions qcodes/instrument/channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion science_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==1.0.3
Expand Down