Tweak mypy

Author: WardBrian

cmdstanpy/install_cmdstan.py

@@ -28,10 +28,9 @@
 from time import sleep
 from typing import Any, Callable, Dict, Optional
 
-from tqdm.auto import tqdm  # type: ignore
+from tqdm.auto import tqdm
 
 from cmdstanpy import _DOT_CMDSTAN, _DOT_CMDSTANPY
-
 from cmdstanpy.utils import (
     cmdstan_path,
     do_command,

cmdstanpy/install_cxx_toolchain.py

@@ -303,11 +303,6 @@ def main(args: Dict[str, Any]) -> None:
 
     if 'progress' in args:
         progress = args['progress']
-        try:
-            # pylint: disable=unused-import
-            from tqdm import tqdm  # noqa: F401
-        except (ImportError, ModuleNotFoundError):
-            progress = False
     else:
         progress = False
 

cmdstanpy/model.py

@@ -14,24 +14,17 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Mapping, Optional, Union
 
-from tqdm.auto import tqdm  # type: ignore
-
-from cmdstanpy import (
-    _CMDSTAN_REFRESH,
-    _CMDSTAN_SAMPLING,
-    _CMDSTAN_WARMUP,
-)
+from tqdm.auto import tqdm
 
+from cmdstanpy import _CMDSTAN_REFRESH, _CMDSTAN_SAMPLING, _CMDSTAN_WARMUP
 from cmdstanpy.cmdstan_args import (
     CmdStanArgs,
     GenerateQuantitiesArgs,
     OptimizeArgs,
     SamplerArgs,
     VariationalArgs,
 )
-
 from cmdstanpy.compiler_opts import CompilerOptions
-
 from cmdstanpy.stanfit import (
     CmdStanGQ,
     CmdStanMCMC,
@@ -40,7 +33,6 @@
     RunSet,
     from_csv,
 )
-
 from cmdstanpy.utils import (
     EXTENSION,
     MaybeDictToFilePath,
@@ -1353,10 +1345,10 @@ def _run_cmdstan(
                     )  # make the typechecker happy
                     sampler_args.fixed_param = True
 
-    # pylint: disable=no-self-use
+    @staticmethod
     @progbar.wrap_callback
     def _wrap_sampler_progress_hook(
-        self, chain_id: int, total: int
+        chain_id: int, total: int
     ) -> Optional[Callable[[str], None]]:
         """Sets up tqdm callback for CmdStan sampler console msgs."""
         pbar: tqdm = tqdm(

cmdstanpy/utils.py

@@ -31,7 +31,7 @@
 import numpy as np
 import pandas as pd
 import ujson as json
-from tqdm.auto import tqdm  # type: ignore
+from tqdm.auto import tqdm
 
 from cmdstanpy import (
     _CMDSTAN_SAMPLING,
@@ -990,7 +990,7 @@ def do_command(
 
 
 def returncode_msg(retcode: int) -> str:
-    """ interpret retcode"""
+    """interpret retcode"""
     if retcode < 0:
         sig = -1 * retcode
         return f'terminated by signal {sig}'

pyproject.toml

@@ -20,7 +20,9 @@ warn_return_any = true
 
 [[tool.mypy.overrides]]
 module = [
-    'tqdm',
+        'tqdm.auto',
+
+    'tqdm.auto',
     'pandas',
     'ujson',
     'numpy', # these two are required for py36, which numpy 1.21 doesn't support