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.

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

Fix CI on Master branch #145

Merged
merged 5 commits into from
Aug 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ jobs:
- name: prepare pip cache
id: prepare-cache-pip
uses: ./.github/actions/prepare-cache-pip
- name: download requirements
run: |
curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/requirements.txt > requirements.txt
- name: pip cache
uses: actions/cache@v2.1.6
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ jobs:
uses: actions/setup-python@v2.2.2
with:
python-version: ${{ matrix.python-version }}

- name: download requirements
run: |
curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/requirements.txt > requirements.txt

- name: prepare pip cache
id: prepare-cache-pip
uses: ./.github/actions/prepare-cache-pip
Expand Down
48 changes: 2 additions & 46 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@
# Configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
"pandas": ("https://pandas.pydata.org/pandas-docs/stable/", None),
"matplotlib": ("https://matplotlib.org/", None),
"python": ("https://docs.python.org/3.6", None),
"matplotlib": ("https://matplotlib.org/stable", None),
"python": ("https://docs.python.org/3.10", None),
"numpy": ("https://numpy.org/doc/stable", None),
"py": ("https://pylib.readthedocs.io/en/stable/", None),
"pyvisa": ("https://pyvisa.readthedocs.io/en/stable/", None),
"IPython": (
"https://ipython.readthedocs.io/en/stable/",
Expand Down Expand Up @@ -133,46 +132,3 @@
"niswitch",
"zhinst",
]

# we allow most types from the typing modules to be used in
# docstrings even if they don't resolve
nitpick_ignore = [
("py:class", "Optional"),
("py:class", "Dict"),
("py:class", "Union"),
("py:class", "Any"),
("py:class", "Tuple"),
("py:class", "List"),
("py:class", "Sequence"),
("py:class", "Iterable"),
("py:class", "Type"),
# These are some types currently in use
# in docstrings not actually defined anywhere
("py:class", "io_manager"),
("py:class", "chan_type"),
("py:class", "SD_Wave"),
("py:class", "array"),
# private types that are not currently documented so links
# will not resolve
("py:class", "SweepFixedValues"),
(
"py:class",
"qcodes_contrib_drivers.drivers.RohdeSchwarz."
"private.HMC804x._RohdeSchwarzHMC804x",
),
# We don't generate the docs for function since
# it is deprecated
("py:class", "Function"),
# We do not document any QCoDeS classes
("py:class", "Parameter"),
# External types that for some reason or the other
# don't resolve.
("py:class", "json.encoder.JSONEncoder"),
("py:class", "SPI_rack"),
("py:class", "spirack.SPI_rack"),
("py:class", "ViAttr"),
("py:class", "unittest.case.TestCase"),
("py:class", "builtins.AssertionError"),
("py:class", "_ctypes.Structure"),
("py:exc", "visa.VisaIOError"),
]
4 changes: 2 additions & 2 deletions qcodes_contrib_drivers/drivers/NationalInstruments/Switch.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import logging
from typing import Dict, List, Optional
from typing import Dict, List, Optional, cast

from niswitch import PathCapability, Session
from qcodes import ChannelList, Instrument, InstrumentChannel
Expand Down Expand Up @@ -158,5 +158,5 @@ def disconnect_from_all(self) -> None:
Disconnect this channel from all channels it is connected to.
"""
while len(self.connection_list) > 0:
ch = self.connection_list[0]
ch = cast(SwitchChannel, self.connection_list[0])
self.disconnect_from(ch)
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mypy==0.971
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ zip_safe = False
packages = find:
python_requires = >=3.7
install_requires =
qcodes>=0.4.0
qcodes>=0.29.0
versioningit>=1.1.0

[options.extras_require]
Expand Down