More updates

Author: chadrik

mypy-baseline.txt

@@ -46,7 +46,6 @@ src/rez/utils/platform_.py:0: error: Module has no attribute "windll"  [attr-def
 src/rez/utils/platform_.py:0: error: Module has no attribute "WinError"  [attr-defined]
 src/rez/utils/platform_.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "Platform")  [assignment]
 src/rez/utils/filesystem.py:0: error: Module has no attribute "WindowsError"  [attr-defined]
-src/rez/utils/filesystem.py:0: error: Argument 1 to "extend" of "list" has incompatible type "tuple[Any, Any, str]"; expected "Iterable[tuple[Any, Any, str]]"  [arg-type]
 src/rez/utils/filesystem.py:0: error: Name "unicode" is not defined  [name-defined]
 src/rez/utils/filesystem.py:0: error: Name "unicode" is not defined  [name-defined]
 src/rez/utils/filesystem.py:0: error: Name "xrange" is not defined  [name-defined]
@@ -115,10 +114,11 @@ src/rez/package_order.py:0: error: Incompatible types in assignment (expression
 src/rez/package_order.py:0: error: Argument 1 to "sort_key" of "PackageOrder" has incompatible type "str | None"; expected "str"  [arg-type]
 src/rez/package_filter.py:0: error: "type[property]" has no attribute "uncache"  [attr-defined]
 src/rez/package_filter.py:0: error: Too many arguments for "RegexRuleBase"  [call-arg]
-src/rez/package_cache.py:0: error: Module has no attribute "CREATE_NEW_PROCESS_GROUP"  [attr-defined]
 src/rez/resolver.py:0: error: Argument 1 to "get_variant_state_handle" of "PackageRepository" has incompatible type "Resource"; expected "PackageResource"  [arg-type]
 src/rez/resolver.py:0: error: Argument 1 to "get_variant_state_handle" of "PackageRepository" has incompatible type "Resource"; expected "PackageResource"  [arg-type]
+src/rez/package_cache.py:0: error: Module has no attribute "CREATE_NEW_PROCESS_GROUP"  [attr-defined]
 src/rez/resolved_context.py:0: error: Incompatible return value type (got "_Wrapped[[VarArg(Any), KwArg(Any)], Any, [Any, VarArg(Any), KwArg(Any)], Any]", expected "CallableT")  [return-value]
+src/rez/resolved_context.py:0: error: Argument "verbosity" to "Resolver" has incompatible type "int"; expected "bool"  [arg-type]
 src/rez/resolved_context.py:0: error: Item "None" of "list[Variant] | None" has no attribute "__iter__" (not iterable)  [union-attr]
 src/rez/resolved_context.py:0: error: Argument 1 to "get_equivalent_variant" of "PackageRepository" has incompatible type "Resource | Any"; expected "VariantResource"  [arg-type]
 src/rez/resolved_context.py:0: error: Item "None" of "list[Variant] | None" has no attribute "__iter__" (not iterable)  [union-attr]
@@ -144,7 +144,9 @@ src/rez/suite.py:0: error: Item "None" of "defaultdict[str, list[Tool]] | None"
 src/rez/suite.py:0: error: Argument 1 to "append" of "list" has incompatible type "Callable[[Any], Any]"; expected "None"  [arg-type]
 src/rez/suite.py:0: error: Argument 1 to "append" of "list" has incompatible type "Callable[[Any], Any]"; expected "None"  [arg-type]
 src/rezplugins/shell/cmd.py:0: error: Signature of "spawn_shell" incompatible with supertype "Shell"  [override]
+src/rezplugins/shell/cmd.py:0: error: "setenv" of "CMD" does not return a value (it only ever returns None)  [func-returns-value]
 src/rezplugins/shell/_utils/powershell_base.py:0: error: Signature of "spawn_shell" incompatible with supertype "Shell"  [override]
+src/rezplugins/shell/_utils/powershell_base.py:0: error: "setenv" of "PowerShellBase" does not return a value (it only ever returns None)  [func-returns-value]
 src/rezplugins/package_repository/filesystem.py:0: error: Argument 1 to "join" has incompatible type "str | None"; expected "str"  [arg-type]
 src/rezplugins/package_repository/filesystem.py:0: error: Argument 2 to "join" has incompatible type "str | None"; expected "str"  [arg-type]
 src/rezplugins/package_repository/filesystem.py:0: error: "PackageRepository" has no attribute "_get_file"  [attr-defined]

src/rez/__init__.py

@@ -18,7 +18,7 @@
 
 
 # TODO: Revamp logging. For now, this is here for backwards compatibility
-def _init_logging():
+def _init_logging() -> None:
     logging_conf = os.getenv("REZ_LOGGING_CONF")
     if logging_conf:
         import logging.config
@@ -50,7 +50,7 @@ def _init_logging():
     import traceback
 
     if action == "print_stack":
-        def callback(sig, frame):
+        def callback(sig, frame) -> None:
             txt = ''.join(traceback.format_stack(frame))
             print()
             print(txt)

src/rez/bind/_pymodule.py

@@ -20,11 +20,11 @@
 import os.path
 
 
-def commands():
+def commands() -> None:
     env.PYTHONPATH.append('{this.root}/python')
 
 
-def commands_with_bin():
+def commands_with_bin() -> None:
     env.PYTHONPATH.append('{this.root}/python')
     env.PATH.append('{this.root}/bin')
 
@@ -88,7 +88,7 @@ def bind(name, path, import_name=None, version_range=None, version=None,
         except RezBindError as e:
             print_warning(str(e))
 
-    def make_root(variant, root):
+    def make_root(variant, root) -> None:
         pypath = make_dirs(root, "python")
         copy_module(import_name, pypath)
 

src/rez/bind/_utils.py

@@ -19,7 +19,7 @@
 import sys
 
 
-def log(msg):
+def log(msg) -> None:
     if config.debug("bind_modules"):
         print_debug(msg)
 
@@ -83,7 +83,7 @@ def find_exe(name, filepath=None):
     return filepath
 
 
-def extract_version(exepath, version_arg, word_index=-1, version_rank=3):
+def extract_version(exepath, version_arg, word_index=-1, version_rank: int=3):
     """Run an executable and get the program version.
 
     Args:

src/rez/bind/cmake.py

@@ -13,12 +13,12 @@
 import os.path
 
 
-def setup_parser(parser):
+def setup_parser(parser) -> None:
     parser.add_argument("--exe", type=str, metavar="PATH",
                         help="manually specify the cmake executable to bind.")
 
 
-def commands():
+def commands() -> None:
     env.PATH.append('{this.root}/bin')
 
 
@@ -28,7 +28,7 @@ def bind(path, version_range=None, opts=None, parser=None):
                               word_index=2 if os.name == 'nt' else -1)
     check_version(version, version_range)
 
-    def make_root(variant, root):
+    def make_root(variant, root) -> None:
         binpath = make_dirs(root, "bin")
         link = os.path.join(binpath, "cmake")
         platform_.symlink(exepath, link)

src/rez/bind/gcc.py

@@ -11,14 +11,14 @@
 from rez.system import system
 
 
-def setup_parser(parser):
+def setup_parser(parser) -> None:
     parser.add_argument('--exe',
                         type=str,
                         metavar='PATH',
                         help='bind other gcc version than default')
 
 
-def commands():
+def commands() -> None:
     env.PATH.append('{this.root}/bin')
 
 
@@ -39,7 +39,7 @@ def bind(path, version_range=None, opts=None, parser=None):
         raise RezBindError("gcc version different than g++ can not continue")
 
     # create directories and symlink gcc and g++
-    def make_root(variant, root):
+    def make_root(variant, root) -> None:
         bin_path = make_dirs(root, 'bin')
 
         gcc_link_path = os.path.join(bin_path, 'gcc')

src/rez/bind/hello_world.py

@@ -19,12 +19,12 @@
 import shutil
 
 
-def commands():
+def commands() -> None:
     env.PATH.append('{this.root}/bin')
     env.OH_HAI_WORLD = "hello"
 
 
-def hello_world_source():
+def hello_world_source() -> None:
     import sys
     from optparse import OptionParser
 
@@ -44,7 +44,7 @@ def bind(path, version_range=None, opts=None, parser=None):
     version = Version("1.0")
     check_version(version, version_range)
 
-    def make_root(variant, root):
+    def make_root(variant, root) -> None:
         binpath = make_dirs(root, "bin")
         binpathtmp = make_dirs(root, "bintmp")
         filepath = os.path.join(binpathtmp, "hello_world")

src/rez/bind/python.py

@@ -15,17 +15,17 @@
 import os.path
 
 
-def setup_parser(parser):
+def setup_parser(parser) -> None:
     parser.add_argument("--exe", type=str, metavar="PATH",
                         help="bind an interpreter other than the current "
                         "python interpreter")
 
 
-def commands():
+def commands() -> None:
     env.PATH.append('{this.root}/bin')
 
 
-def post_commands():
+def post_commands() -> None:
     # these are the builtin modules for this python executable. If we don't
     # include these, some python behavior can be incorrect.
     import os
@@ -67,7 +67,7 @@ def bind(path, version_range=None, opts=None, parser=None):
     # make the package
     #
 
-    def make_root(variant, root):
+    def make_root(variant, root) -> None:
         binpath = make_dirs(root, "bin")
         link = os.path.join(binpath, "python")
         platform_.symlink(exepath, link)

src/rez/bind/rez.py

@@ -14,15 +14,15 @@
 import os.path
 
 
-def commands():
+def commands() -> None:
     env.PYTHONPATH.append('{this.root}')
 
 
 def bind(path, version_range=None, opts=None, parser=None):
     version = rez.__version__
     check_version(version, version_range)
 
-    def make_root(variant, root):
+    def make_root(variant, root) -> None:
         # copy source
         rez_path = rez.__path__[0]
         site_path = os.path.dirname(rez_path)

src/rez/bind/rezgui.py

@@ -16,18 +16,18 @@
 import os.path
 
 
-def setup_parser(parser):
+def setup_parser(parser) -> None:
     parser.add_argument(
         "--gui-lib", type=str, default="PyQt-4", metavar="PKG",
         help="manually specify the gui lib to use (default: %(default)s).")
 
 
-def commands():
+def commands() -> None:
     env.PYTHONPATH.append('{this.root}')
     env.PATH.append('{this.root}/bin')
 
 
-def rez_gui_source():
+def rez_gui_source() -> None:
     from rez.cli._main import run
     run("gui")
 
@@ -43,7 +43,7 @@ def bind(path, version_range=None, opts=None, parser=None):
 
     gui_lib = getattr(opts, "gui_lib", "")
 
-    def make_root(variant, root):
+    def make_root(variant, root) -> None:
         # copy source
         rez_path = rez.__path__[0]
         site_path = os.path.dirname(rez_path)