Version 1.6.1 release

Author: sobolevn

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Version history
 
+
+## Version 1.6.1
+
+### Bugfixes
+
+- Changes how `MYPYPATH` and `PYTHONPATH` are calcualted. We now expand `$PWD` variable and also include relative paths specified in `env:` section
+
+
 ## Version 1.6.0
 
 ### Features

pytest_mypy_plugins/item.py

@@ -73,6 +73,7 @@ def replace_fpath_with_module_name(line: str, rootdir: Path) -> str:
 
 
 def maybe_to_abspath(rel_or_abs: str, rootdir: Optional[Path]) -> str:
+    rel_or_abs = os.path.expandvars(rel_or_abs)
     if rootdir is None or os.path.isabs(rel_or_abs):
         return rel_or_abs
     return str(rootdir / rel_or_abs)
@@ -365,9 +366,8 @@ def _collect_python_path(
             python_path_parts.append(str(execution_path))
         python_path_key = self.environment_variables.get("PYTHONPATH")
         if python_path_key:
-            python_path_parts.append(
-                maybe_to_abspath(python_path_key, rootdir),
-            )
+            python_path_parts.append(maybe_to_abspath(python_path_key, rootdir))
+            python_path_parts.append(python_path_key)
 
         self.environment_variables["PYTHONPATH"] = ":".join(python_path_parts)
 
@@ -381,8 +381,7 @@ def _collect_mypy_path(self, rootdir: Optional[Path]) -> None:
             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),
-            )
+            mypy_path_parts.append(maybe_to_abspath(mypy_path_key, rootdir))
+            mypy_path_parts.append(mypy_path_key)
 
         self.environment_variables["MYPYPATH"] = ":".join(mypy_path_parts)

pytest_mypy_plugins/tests/test-paths-from-env.yml

@@ -15,3 +15,15 @@
       main:1: error: Module 'pair' has no attribute 'Missing'
     env:
         - MYPYPATH=./pytest_mypy_plugins/tests/fixtures
+
+
+-   case: add_mypypath_env_var_to_package_search
+    main: |
+        import extra_module
+    env:
+      - MYPYPATH=./extras
+    files:
+        -   path: extras/extra_module.py
+            content: |
+                def extra_fn():
+                  pass

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name="pytest-mypy-plugins",
-    version="1.6.0",
+    version="1.6.1",
     description="pytest plugin for writing tests for mypy plugins",
     long_description=readme,
     long_description_content_type="text/markdown",