Commit 846aee3a by David Hotham Committed by GitHub

fix check for in-project-venv (#7977)

parent 88cb8266
...@@ -695,7 +695,7 @@ class EnvManager: ...@@ -695,7 +695,7 @@ class EnvManager:
if not in_venv or env is not None: if not in_venv or env is not None:
# Checking if a local virtualenv exists # Checking if a local virtualenv exists
if self.use_in_project_venv(): if self.in_project_venv_exists():
venv = self.in_project_venv venv = self.in_project_venv
return VirtualEnv(venv) return VirtualEnv(venv)
...@@ -733,7 +733,7 @@ class EnvManager: ...@@ -733,7 +733,7 @@ class EnvManager:
venv_path = self._poetry.config.virtualenvs_path venv_path = self._poetry.config.virtualenvs_path
env_list = [VirtualEnv(p) for p in sorted(venv_path.glob(f"{venv_name}-py*"))] env_list = [VirtualEnv(p) for p in sorted(venv_path.glob(f"{venv_name}-py*"))]
if self.use_in_project_venv(): if self.in_project_venv_exists():
venv = self.in_project_venv venv = self.in_project_venv
env_list.insert(0, VirtualEnv(venv)) env_list.insert(0, VirtualEnv(venv))
return env_list return env_list
...@@ -852,6 +852,14 @@ class EnvManager: ...@@ -852,6 +852,14 @@ class EnvManager:
in_project: bool | None = self._poetry.config.get("virtualenvs.in-project") in_project: bool | None = self._poetry.config.get("virtualenvs.in-project")
if in_project is not None: if in_project is not None:
return in_project return in_project
return self.in_project_venv.is_dir()
def in_project_venv_exists(self) -> bool:
in_project: bool | None = self._poetry.config.get("virtualenvs.in-project")
if in_project is False:
return False
return self.in_project_venv.is_dir() return self.in_project_venv.is_dir()
def create_venv( def create_venv(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment