Skip to content

Add support for pyi_srcs / direct_pyi_files #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Add support for pyi_srcs / direct_pyi_files #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions mypy/private/mypy.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ def _mypy_impl(target, ctx):
for import_ in _extract_imports(target):
imports_dirs[import_] = 1

pyi_files = []
pyi_dirs = {}
for dep in (ctx.rule.attr.deps + additional_types):
if RulesPythonPyInfo in dep and hasattr(dep[RulesPythonPyInfo], "direct_pyi_files"):
pyi_files.extend(dep[RulesPythonPyInfo].direct_pyi_files.to_list())
pyi_dirs |= {"%s/%s" % (ctx.bin_dir.path, imp): None for imp in _extract_imports(dep) if imp != "site-packages" and imp != "_main"}
depsets.append(dep.default_runfiles.files)

if PyTypeLibraryInfo in dep:
Expand Down Expand Up @@ -140,7 +145,7 @@ def _mypy_impl(target, ctx):

# types need to appear first in the mypy path since the module directories
# are the same and mypy resolves the first ones, first.
mypy_path = ":".join(sorted(types) + sorted(external_deps) + sorted(imports_dirs) + sorted(generated_dirs) + sorted(generated_imports_dirs))
mypy_path = ":".join(sorted(types) + sorted(pyi_dirs) + sorted(external_deps) + sorted(imports_dirs) + sorted(generated_dirs) + sorted(generated_imports_dirs))

output_file = ctx.actions.declare_file(ctx.rule.attr.name + ".mypy_stdout")

Expand Down Expand Up @@ -182,7 +187,7 @@ def _mypy_impl(target, ctx):
mnemonic = "mypy",
progress_message = "mypy %{label}",
inputs = depset(
direct = ctx.rule.files.srcs + py_type_files + upstream_caches + config_files,
direct = ctx.rule.files.srcs + py_type_files + pyi_files + upstream_caches + config_files,
transitive = depsets,
),
outputs = outputs,
Expand Down