Merge branch 'master' into fix/hdf5

microsoft · Feb 11, 2019 · ff16f88 · ff16f88
2 parents 69d99b5 + 67d0c83
commit ff16f88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/qcodes/logger/logger.py b/qcodes/logger/logger.py
@@ -89,7 +89,7 @@ def get_level_code(level: Union[str, int]) -> int:
         # bug:
         # >>> import logging
         # >>> print(logging.getLevelName('DEBUG'))
-        return logging.getLevelName(level)  # type: ignore
+        return logging.getLevelName(level)
     else:
         raise RuntimeError('get_level_code: '
                            f'Cannot to convert level {level} of type '

diff --git a/test_requirements.txt b/test_requirements.txt
@@ -3,7 +3,7 @@ pytest-cov
 pytest
 codacy-coverage
 hypothesis!=3.69.11 # due to bug in log capture
-mypy>=0.630
+mypy==0.670
 git+https://github.com/QCoDeS/pyvisa-sim.git
 lxml
 codecov