Add more annotations

Author: chadrik

mypy-baseline.txt

@@ -40,7 +40,6 @@ src/rez/util.py:0: error: Item "None" of "Loader | Any | None" has no attribute
 src/rez/utils/backcompat.py:0: error: Item "None" of "Match[str] | None" has no attribute "groupdict"  [union-attr]
 src/rez/utils/backcompat.py:0: error: Item "None" of "Match[str] | None" has no attribute "groupdict"  [union-attr]
 src/rez/utils/sourcecode.py:0: error: Item "None" of "FunctionType | MethodType | None" has no attribute "__name__"  [union-attr]
-src/rez/utils/sourcecode.py:0: error: Incompatible types in assignment (expression has type "str | Any", variable has type "None")  [assignment]
 src/rez/utils/sourcecode.py:0: error: Argument 1 to "getsourcelines" has incompatible type "FunctionType | MethodType | None"; expected Module | type[Any] | MethodType | FunctionType | TracebackType | FrameType | CodeType | Callable[..., Any]  [arg-type]
 src/rez/utils/platform_.py:0: error: Module has no attribute "windll"  [attr-defined]
 src/rez/utils/platform_.py:0: error: Module has no attribute "WinError"  [attr-defined]
@@ -112,26 +111,37 @@ src/rez/packages.py:0: error: Argument 1 to "Variant" has incompatible type "Res
 src/rez/solver.py:0: error: Argument 1 to "set_context" of "PackageBaseResourceWrapper" has incompatible type "ResolvedContext | None"; expected "ResolvedContext"  [arg-type]
 src/rez/package_order.py:0: error: Incompatible types in assignment (expression has type "Iterable[str] | None", variable has type "list[str]")  [assignment]
 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_maker.py:0: error: Item "None" of "Variant | None" has no attribute "base"  [union-attr]
+src/rez/package_maker.py:0: error: Argument 1 has incompatible type "Variant | None"; expected "Variant"  [arg-type]
+src/rez/package_maker.py:0: error: Item "None" of "Variant | None" has no attribute "root"  [union-attr]
+src/rez/package_maker.py:0: error: Argument 1 has incompatible type "Variant | None"; expected "Variant"  [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/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/resolver.py:0: error: Item "None" of "list[PackageVariant] | None" has no attribute "__iter__" (not iterable)  [union-attr]
+src/rez/resolver.py:0: error: Item "None" of "list[Requirement] | None" has no attribute "__iter__" (not iterable)  [union-attr]
 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]
+src/rez/resolved_context.py:0: error: Argument 1 to "get_equivalent_variant" of "PackageRepository" has incompatible type "Resource"; 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]
 src/rez/resolved_context.py:0: error: Incompatible types in assignment (expression has type "list[Requirement]", variable has type "list[PackageRequest]")  [assignment]
 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 "__iadd__" of "list" has incompatible type "list[str]"; expected "Iterable[PackageRequest]"  [arg-type]
 src/rez/resolved_context.py:0: error: Item "None" of "ResolvedContext | None" has no attribute "set_load_path"  [union-attr]
 src/rez/resolved_context.py:0: error: Incompatible return value type (got "ResolvedContext | None", expected "ResolvedContext")  [return-value]
+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: Item "None" of "list[Variant] | None" has no attribute "__iter__" (not iterable)  [union-attr]
 src/rez/resolved_context.py:0: error: Argument 1 to "append" of "list" has incompatible type "Callable[[Any], Any] | None"; expected "None"  [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: Item "None" of "list[Requirement] | None" has no attribute "__iter__" (not iterable)  [union-attr]
 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: Item "None" of "list[Variant] | None" has no attribute "__iter__" (not iterable)  [union-attr]
 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: Item "None" of "list[Variant] | None" has no attribute "__iter__" (not iterable)  [union-attr]
 src/rez/resolved_context.py:0: error: Incompatible types in assignment (expression has type "list[PackageOrder]", variable has type "PackageOrderList")  [assignment]
 src/rez/resolved_context.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "PackageOrderList")  [assignment]
 src/rez/resolved_context.py:0: error: Argument 1 to "update" of "MutableMapping" has incompatible type "dict[str, Any] | None"; expected "SupportsKeysAndGetItem[str, Any]"  [arg-type]
@@ -178,7 +188,6 @@ src/rezplugins/package_repository/filesystem.py:0: error: Return type "PackageRe
 src/rezplugins/package_repository/filesystem.py:0: error: Argument 1 of "get_variant_state_handle" is incompatible with supertype "PackageRepository"; supertype defines the argument type as "PackageResource"  [override]
 src/rezplugins/package_repository/filesystem.py:0: error: "PackageRepositoryResource" has no attribute "state_handle"  [attr-defined]
 src/rezplugins/package_repository/filesystem.py:0: error: "PackageFamilyResource" has no attribute "get_last_release_time"  [attr-defined]
-src/rezplugins/package_repository/filesystem.py:0: error: Return type "Variant | None" of "get_variant_from_uri" incompatible with return type "VariantResource | None" in supertype "PackageRepository"  [override]
 src/rezplugins/package_repository/filesystem.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "int | None")  [assignment]
 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: Argument 1 to "remove_package" of "FileSystemPackageRepository" has incompatible type "str | None"; expected "str"  [arg-type]
@@ -217,6 +226,7 @@ src/rezplugins/package_repository/filesystem.py:0: error: Item "None" of "Any |
 src/rezplugins/package_repository/filesystem.py:0: error: "VariantResource" has no attribute "variant_requires"  [attr-defined]
 src/rezplugins/package_repository/filesystem.py:0: error: Argument 2 to "join" has incompatible type "Any | str | None"; expected "str"  [arg-type]
 src/rezplugins/package_repository/filesystem.py:0: error: Argument 1 to "_on_changed" of "FileSystemPackageRepository" has incompatible type "Any | str | None"; expected "str"  [arg-type]
+src/rezplugins/package_repository/filesystem.py:0: error: Argument 1 to "get_package" of "PackageRepository" has incompatible type "Any | str | None"; expected "str"  [arg-type]
 src/rez/package_test.py:0: error: Item "None" of "ResolvedContext | None" has no attribute "get_resolved_package"  [union-attr]
 src/rez/package_test.py:0: error: Item "None" of "Variant | Any | None" has no attribute "uri"  [union-attr]
 src/rez/package_test.py:0: error: Item "None" of "Variant | Any | None" has no attribute "variant_requires"  [union-attr]
@@ -293,11 +303,9 @@ src/rez/bind/_pymodule.py:0: error: Name "env" is not defined  [name-defined]
 src/rez/bind/_pymodule.py:0: error: Name "env" is not defined  [name-defined]
 src/rezplugins/build_process/local.py:0: error: Argument 1 to "join" of "str" has incompatible type "list[str | None]"; expected "Iterable[str]"  [arg-type]
 src/rezplugins/build_process/local.py:0: error: Argument 1 to "pre_variant_install" of "PackageRepository" has incompatible type "Resource"; expected "VariantResource"  [arg-type]
-src/rezplugins/build_process/local.py:0: error: Unexpected TypedDict keys ("package_install_path", "variant_install_path")  [misc]
 src/rezplugins/build_process/local.py:0: error: Argument 1 to "get_repository" of "PackageRepositoryManager" has incompatible type "str | None"; expected "str"  [arg-type]
 src/rezplugins/build_process/local.py:0: error: Argument 1 to "on_variant_install_cancelled" of "PackageRepository" has incompatible type "Resource"; expected "VariantResource"  [arg-type]
-src/rezplugins/build_process/local.py:0: error: TypedDict "BuildResult" has no key "package_install_path"  [typeddict-item]
-src/rezplugins/build_process/local.py:0: error: TypedDict "BuildResult" has no key "variant_install_path"  [typeddict-item]
+src/rezplugins/build_process/local.py:0: error: Argument 1 to "on_variant_install_cancelled" of "PackageRepository" has incompatible type "Resource"; expected "VariantResource"  [arg-type]
 src/rez/cli/pip.py:0: error: "Config" has no attribute "debug_package_release"  [attr-defined]
 src/rez/cli/release.py:0: error: Name "raw_input" is not defined  [name-defined]
 src/rez/cli/selftest.py:0: error: Argument 1 to "getfile" has incompatible type "FrameType | None"; expected Module | type[Any] | MethodType | FunctionType | TracebackType | FrameType | CodeType | Callable[..., Any]  [arg-type]

src/rez/bundle_context.py

@@ -2,6 +2,8 @@
 # Copyright Contributors to the Rez Project
 
 
+from __future__ import annotations
+
 import os
 import os.path
 import stat

src/rez/cli/bind.py

@@ -5,6 +5,8 @@
 '''
 Create a Rez package for existing software.
 '''
+from __future__ import annotations
+
 import argparse
 
 

src/rez/cli/bundle.py

@@ -5,6 +5,8 @@
 '''
 Bundle a context and its packages into a relocatable dir.
 '''
+from __future__ import annotations
+
 import os
 import os.path
 import sys

src/rez/cli/complete.py

@@ -5,6 +5,8 @@
 """
 Prints package completion strings.
 """
+from __future__ import annotations
+
 import argparse
 
 

src/rez/cli/config.py

@@ -5,6 +5,8 @@
 '''
 Print current rez settings.
 '''
+from __future__ import annotations
+
 import json
 
 

src/rez/cli/context.py

@@ -13,6 +13,8 @@
 # Since features such as context tracking are related to context use only, we
 # disable them in this tool.
 #
+from __future__ import annotations
+
 import os
 import json
 import sys

src/rez/cli/cp.py

@@ -5,6 +5,7 @@
 '''
 Copy a package from one repository to another.
 '''
+from __future__ import annotations
 
 
 def setup_parser(parser, completions: bool = False) -> None:

src/rez/cli/depends.py

@@ -5,6 +5,7 @@
 """
 Perform a reverse package dependency lookup.
 """
+from __future__ import annotations
 
 
 def setup_parser(parser, completions: bool = False) -> None:

src/rez/cli/diff.py

@@ -5,6 +5,7 @@
 """
 Compare the source code of two packages.
 """
+from __future__ import annotations
 
 
 def setup_parser(parser, completions: bool = False) -> None: