1 files changed, 13 insertions, 12 deletions
diff --git a/pyproject.toml b/pyproject.toml
index d33b27a99c..be97f0421e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -70,17 +70,8 @@ features = [
 [tool.black]
 line-length = 99
 target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
-include = '''
-    \.pyi?$
-'''
-extend-exclude = '''
-/(
-    \.git
-  | \.mypy_cache
-  | ^lib/spack/external/
-  | ^opt/
-)/
-'''
+include = '(lib/spack|var/spack/repos)/.*\.pyi?$|bin/spack$'
+extend-exclude = 'lib/spack/external'
 skip_magic_trailing_comma = true
 
 [tool.isort]
@@ -154,11 +145,13 @@ ignore_missing_imports = true
       'boto3',
       'botocore',
       'distro',
+      'importlib.metadata',
       'jinja2',
       'jsonschema',
       'macholib',
       'markupsafe',
       'numpy',
+      'pkg_resources',
       'pyristent',
       'pytest',
       'ruamel.yaml',
@@ -171,7 +164,7 @@ ignore_missing_imports = true
 useLibraryCodeForTypes = true
 reportMissingImports = true
 reportWildcardImportFromLibrary = false
-include = ['lib/spack']
+include = ['lib/spack', 'var/spack/repos']
 ignore = ['lib/spack/external']
 extraPaths = ['lib/spack', 'lib/spack/external']
 
@@ -210,6 +203,14 @@ exclude_lines = [
 ]
 ignore_errors = true
 
+[tool.coverage.paths]
+source = [
+    ".",
+    "/Users/runner/work/spack/spack",
+    "/System/Volumes/Data/home/runner/work/spack/spack",
+    "D:\\a\\spack\\spack",
+]
+
 [tool.coverage.html]
 directory = "htmlcov"