From cead24698940326666c8677f6991b70c335a4649 Mon Sep 17 00:00:00 2001
From: David Hotham <david.hotham@microsoft.com>
Date: Wed, 31 Aug 2022 12:31:02 +0100
Subject: [PATCH] not every InstallerCommand is an EnvCommand

---
 src/poetry/console/application.py                | 3 +--
 src/poetry/console/commands/add.py               | 3 ++-
 src/poetry/console/commands/install.py           | 3 ++-
 src/poetry/console/commands/installer_command.py | 3 +--
 src/poetry/console/commands/lock.py              | 3 ++-
 src/poetry/console/commands/remove.py            | 3 ++-
 src/poetry/console/commands/update.py            | 3 ++-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/poetry/console/application.py b/src/poetry/console/application.py
index 2b6bd633c50..274cfcfc498 100644
--- a/src/poetry/console/application.py
+++ b/src/poetry/console/application.py
@@ -276,10 +276,9 @@ def configure_env(
         self, event: ConsoleCommandEvent, event_name: str, _: Any
     ) -> None:
         from poetry.console.commands.env_command import EnvCommand
-        from poetry.console.commands.self.self_command import SelfCommand
 
         command = event.command
-        if not isinstance(command, EnvCommand) or isinstance(command, SelfCommand):
+        if not isinstance(command, EnvCommand):
             return
 
         if command._env is not None:
diff --git a/src/poetry/console/commands/add.py b/src/poetry/console/commands/add.py
index 99af6758698..9b1a5ca8095 100644
--- a/src/poetry/console/commands/add.py
+++ b/src/poetry/console/commands/add.py
@@ -12,9 +12,10 @@
 
 from poetry.console.commands.init import InitCommand
 from poetry.console.commands.installer_command import InstallerCommand
+from poetry.console.commands.env_command import EnvCommand
 
 
-class AddCommand(InstallerCommand, InitCommand):
+class AddCommand(InstallerCommand, EnvCommand, InitCommand):
     name = "add"
     description = "Adds a new dependency to <comment>pyproject.toml</>."
 
diff --git a/src/poetry/console/commands/install.py b/src/poetry/console/commands/install.py
index 782ce48c445..55adca7615f 100644
--- a/src/poetry/console/commands/install.py
+++ b/src/poetry/console/commands/install.py
@@ -2,10 +2,11 @@
 
 from cleo.helpers import option
 
+from poetry.console.commands.env_command import EnvCommand
 from poetry.console.commands.installer_command import InstallerCommand
 
 
-class InstallCommand(InstallerCommand):
+class InstallCommand(InstallerCommand, EnvCommand):
     name = "install"
     description = "Installs the project dependencies."
 
diff --git a/src/poetry/console/commands/installer_command.py b/src/poetry/console/commands/installer_command.py
index 7fdceaeb72f..b361737dac7 100644
--- a/src/poetry/console/commands/installer_command.py
+++ b/src/poetry/console/commands/installer_command.py
@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-from poetry.console.commands.env_command import EnvCommand
 from poetry.console.commands.group_command import GroupCommand
 
 
@@ -10,7 +9,7 @@
     from poetry.installation.installer import Installer
 
 
-class InstallerCommand(GroupCommand, EnvCommand):
+class InstallerCommand(GroupCommand):
     def __init__(self) -> None:
         # Set in poetry.console.application.Application.configure_installer
         self._installer: Installer | None = None
diff --git a/src/poetry/console/commands/lock.py b/src/poetry/console/commands/lock.py
index 57c9ed74f77..b7d32972663 100644
--- a/src/poetry/console/commands/lock.py
+++ b/src/poetry/console/commands/lock.py
@@ -2,10 +2,11 @@
 
 from cleo.helpers import option
 
+from poetry.console.commands.env_command import EnvCommand
 from poetry.console.commands.installer_command import InstallerCommand
 
 
-class LockCommand(InstallerCommand):
+class LockCommand(InstallerCommand, EnvCommand):
     name = "lock"
     description = "Locks the project dependencies."
 
diff --git a/src/poetry/console/commands/remove.py b/src/poetry/console/commands/remove.py
index 01810f8092b..64c73a3c590 100644
--- a/src/poetry/console/commands/remove.py
+++ b/src/poetry/console/commands/remove.py
@@ -8,10 +8,11 @@
 from poetry.core.packages.dependency_group import MAIN_GROUP
 from tomlkit.toml_document import TOMLDocument
 
+from poetry.console.commands.env_command import EnvCommand
 from poetry.console.commands.installer_command import InstallerCommand
 
 
-class RemoveCommand(InstallerCommand):
+class RemoveCommand(InstallerCommand, EnvCommand):
     name = "remove"
     description = "Removes a package from the project dependencies."
 
diff --git a/src/poetry/console/commands/update.py b/src/poetry/console/commands/update.py
index b880f5a89db..f9d3457cc30 100644
--- a/src/poetry/console/commands/update.py
+++ b/src/poetry/console/commands/update.py
@@ -3,10 +3,11 @@
 from cleo.helpers import argument
 from cleo.helpers import option
 
+from poetry.console.commands.env_command import EnvCommand
 from poetry.console.commands.installer_command import InstallerCommand
 
 
-class UpdateCommand(InstallerCommand):
+class UpdateCommand(InstallerCommand, EnvCommand):
     name = "update"
     description = (
         "Update the dependencies as according to the <comment>pyproject.toml</> file."