Merge pull request #2258 from NMGRL/develop

mypy: add stub packages and widen base class attribute types

Author: jirhiker

pychron/__init__.py

@@ -17,9 +17,9 @@
 from .version import __version__
 
 try:
-    import ujson as json
+    import ujson as json  # type: ignore[no-redef]
 except ImportError:
     try:
-        import simplejson as json
+        import simplejson as json  # type: ignore[no-redef]
     except ImportError:
-        import json
+        import json  # type: ignore[no-redef]

pychron/envisage/initialization/nodes.py

@@ -51,8 +51,8 @@ def get_icon(self, object, is_expanded):
 
 
 class BaseNode(HasTraits):
-    name = Str
-    enabled = Bool
+    name: str = ""
+    enabled: bool = True
 
 
 class Plugin(BaseNode):
@@ -73,11 +73,7 @@ class PluginTree(Plugin):
     def get_subtree(self, name):
         name = name.lower()
         return next(
-            (
-                p
-                for p in self.plugins
-                if isinstance(p, PluginTree) and p.name.lower() == name
-            )
+            (p for p in self.plugins if isinstance(p, PluginTree) and p.name.lower() == name)
         )
 
     def set_all_enabled(self, v):

pychron/experiment/__init__.py

@@ -23,7 +23,7 @@ def __init__(self, m):
 
 
 class CheckException(BaseException):
-    tag = None
+    tag: str | None = None
 
     def __init__(self, msg):
         self._msg = msg

pychron/experiment/utilities/comment_template.py

@@ -17,7 +17,7 @@
 # ============= enthought library imports =======================
 from __future__ import absolute_import
 
-from traits.api import List, Dict
+from traits.api import List, Dict, Str
 
 from pychron.core.templater.base_templater import BaseTemplater
 
@@ -28,7 +28,7 @@ class CommentTemplater(BaseTemplater):
 
     base_predefined_labels = List(["", "irrad_level : irrad_hole"])
 
-    label = "irrad_level : irrad_hole"
+    label = Str("irrad_level : irrad_hole")
     persistence_name = "comment"
 
     def render(self, obj):

pychron/pyscripts/commands/core.py

@@ -44,8 +44,8 @@ def uncamelcase(name):
 
 
 class Command(HasTraits):
-    description = Str
-    example = Str
+    description: str = ""
+    example: str = ""
     name = Property
 
     #    implements(ICommand)
@@ -66,7 +66,7 @@ def _get_command(self):
 
     #        return self.__class__.__name__.lower()
 
-    def _to_string(self):
+    def _to_string(self) -> str:
         return ""
 
     @classmethod
@@ -99,9 +99,7 @@ def get_text(self):
         return self.to_string()
 
     def traits_view(self):
-        v = View(
-            self._get_view(), title=self.__class__.__name__, buttons=OKCancelButtons
-        )
+        v = View(self._get_view(), title=self.__class__.__name__, buttons=OKCancelButtons)
         return v
 
     def help_view(self):
@@ -189,14 +187,16 @@ def _get_view(self):
             #                    width=600,
         )
 
-    def _to_string(self):
-        if os.path.isfile(self.path):
-            head, tail = os.path.split(self.path)
+    def _to_string(self) -> str:
+        path = str(self.path)
+        if path and os.path.isfile(path):
+            head, tail = os.path.split(path)
             words = [
                 ("name", tail),
                 ("root", head),
             ]
             return self._keywords(words)
+        return ""
 
 
 class BeginInterval(Command):

pychron/tx/errors.py

@@ -17,13 +17,16 @@
 
 # =============enthought library imports=======================
 # ============= standard library imports ========================
+from __future__ import annotations
+
+
 # ============= local library imports  ==========================
 class ErrorCode(object):
-    msg = ""
-    code = None
-    description = ""
+    msg: str = ""
+    code: str | None = None
+    description: str = ""
 
-    def __str__(self):
+    def __str__(self) -> str:
         return "ERROR {} : {}".format(self.code, self.msg)
 
 

pychron/tx/protocols/base_valve.py

@@ -29,7 +29,7 @@
 
 
 class BaseValveProtocol(ServiceProtocol):
-    manager_protocol = None
+    manager_protocol: str | None = None
 
     def __init__(self, application, addr, logger):
         ServiceProtocol.__init__(self, logger=logger)

pyproject.toml

@@ -99,4 +99,12 @@ dev = [
     "black",
     "mypy>=1.15.0,<2",
     "pre-commit>=4.2.0,<5",
+    "types-requests",
+    "types-pyyaml",
+    "types-six",
+    "types-simplejson",
+    "types-ujson",
+    "types-pytz",
+    "types-pymysql",
+    "types-paramiko",
 ]