Remove base path from MYPYPATH

After python/mypy#11143, the search path for mypy has changed, resulting in the current path being present. Explicitly adding in the base path results in an error about the directory from the search_path (cwd) being present in `MYPYPATH`. Removing the base path from `MYPYPATH` and relying on just `pyinfo` to load the current path in appears to work as expected.
DamianZaremba · Jul 20, 2022 · c10b039 · c10b039
1 parent e3ce0bf
commit c10b039
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 32 deletions.
diff --git a/pytest_mypy_plugins/item.py b/pytest_mypy_plugins/item.py
@@ -384,8 +384,6 @@ def _collect_mypy_path(self, rootdir: Optional[Path]) -> None:
  existing_mypy_path = os.environ.get("MYPYPATH")
  if existing_mypy_path:
  mypy_path_parts.append(existing_mypy_path)
- if self.base_ini_fpath:
- mypy_path_parts.append(os.path.dirname(self.base_ini_fpath))
  mypy_path_key = self.environment_variables.get("MYPYPATH")
  if mypy_path_key:
  mypy_path_parts.append(maybe_to_abspath(mypy_path_key, rootdir))

diff --git a/pytest_mypy_plugins/tests/test-paths-from-env.yml b/pytest_mypy_plugins/tests/test-paths-from-env.yml
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 dependencies = [
  "pytest>=6.0.0",
- "mypy>=0.900",
+ "mypy>=0.971",
  "decorator",
  "pyyaml",
  "chevron",