Skip to content

Commit 0ad2d34

Browse files
committed
Consider all installations paths for exclusion
1 parent 7b56339 commit 0ad2d34

File tree

2 files changed

+8
-4
lines changed
  • src/charonload
  • tests/data/charonload_installed_project/src/charonload_installed_project

2 files changed

+8
-4
lines changed

src/charonload/_config.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import re
88
import site
99
import sys
10+
import sysconfig
1011
import tempfile
1112
from dataclasses import dataclass
1213
from typing import TYPE_CHECKING
@@ -218,8 +219,9 @@ def _find_stubs_directory(
218219
return full_stubs_directory
219220

220221
def _exclude_install_directories(self: Self, directory: pathlib.Path) -> pathlib.Path | None:
221-
install_directories = [site.getusersitepackages()] if site.ENABLE_USER_SITE else []
222-
install_directories.extend(site.getsitepackages())
222+
install_directories = [site.getuserbase()] if site.ENABLE_USER_SITE else []
223+
install_directories.extend(sysconfig.get_paths().values())
224+
install_directories = list(set(install_directories)) # Remove duplicates
223225

224226
return (
225227
directory

tests/data/charonload_installed_project/src/charonload_installed_project/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
import charonload
44

5-
PROJECT_ROOT_DIRECTORY = pathlib.Path(__file__).parent
5+
PROJECT_ROOT_DIRECTORY = pathlib.Path(__file__).parents[2]
6+
7+
VSCODE_STUBS_DIRECTORY = PROJECT_ROOT_DIRECTORY / "typings"
68

79

810
charonload.module_config["_c_charonload_installed_project"] = charonload.Config(
911
pathlib.Path(__file__).parent / "_C",
1012
build_directory=PROJECT_ROOT_DIRECTORY, # Intentionally do in-source build
11-
stubs_directory=PROJECT_ROOT_DIRECTORY, # Similar to common in-source typings directory for VS Code
13+
stubs_directory=VSCODE_STUBS_DIRECTORY, # Common in-source typings directory for VS Code
1214
verbose=True,
1315
)
1416

0 commit comments

Comments
 (0)