env: do not modify os.environ

poetry/utils/env.py

@@ -11,6 +11,7 @@
 import textwrap
 
 from contextlib import contextmanager
+from copy import deepcopy
 from pathlib import Path
 from subprocess import CalledProcessError
 from typing import Any
@@ -1143,15 +1144,13 @@ def execute(self, bin: str, *args: str, **kwargs: Any) -> Optional[int]:
             return self.run_pip(*args, **kwargs)
 
         bin = self._bin(bin)
+        env = kwargs.pop("env", {k: v for k, v in os.environ.items()})
 
         if not self._is_windows:
             args = [bin] + list(args)
-            if "env" in kwargs:
-                return os.execvpe(bin, args, kwargs["env"])
-            else:
-                return os.execvp(bin, args)
+            return os.execvpe(bin, args, env=env)
         else:
-            exe = subprocess.Popen([bin] + list(args), **kwargs)
+            exe = subprocess.Popen([bin] + list(args), env=env, **kwargs)
             exe.communicate()
             return exe.returncode
 
@@ -1388,24 +1387,35 @@ def is_sane(self) -> bool:
         return os.path.exists(self.python)
 
     def _run(self, cmd: List[str], **kwargs: Any) -> Optional[int]:
-        with self.temp_environ():
-            os.environ["PATH"] = self._updated_path()
-            os.environ["VIRTUAL_ENV"] = str(self._path)
+        kwargs["env"] = self.get_temp_environ(environ=kwargs.get("env"))
+        return super(VirtualEnv, self)._run(cmd, **kwargs)
 
-            self.unset_env("PYTHONHOME")
-            self.unset_env("__PYVENV_LAUNCHER__")
+    def get_temp_environ(
+        self,
+        environ: Optional[Dict[str, str]] = None,
+        exclude: Optional[List[str]] = None,
+        **kwargs: str,
+    ) -> Dict[str, str]:
+        exclude = exclude or []
+        exclude.extend(["PYTHONHOME", "__PYVENV_LAUNCHER__"])
+
+        if environ:
+            environ = deepcopy(environ)
+            for key in exclude:
+                environ.pop(key, None)
+        else:
+            environ = {k: v for k, v in os.environ.items() if k not in exclude}
 
-            return super(VirtualEnv, self)._run(cmd, **kwargs)
+        environ.update(kwargs)
 
-    def execute(self, bin: str, *args: str, **kwargs: Any) -> Optional[int]:
-        with self.temp_environ():
-            os.environ["PATH"] = self._updated_path()
-            os.environ["VIRTUAL_ENV"] = str(self._path)
+        environ["PATH"] = self._updated_path()
+        environ["VIRTUAL_ENV"] = str(self._path)
 
-            self.unset_env("PYTHONHOME")
-            self.unset_env("__PYVENV_LAUNCHER__")
+        return environ
 
-            return super(VirtualEnv, self).execute(bin, *args, **kwargs)
+    def execute(self, bin: str, *args: str, **kwargs: Any) -> Optional[int]:
+        kwargs["env"] = self.get_temp_environ(environ=kwargs.get("env"))
+        return super(VirtualEnv, self).execute(bin, *args, **kwargs)
 
     @contextmanager
     def temp_environ(self) -> Iterator[None]:
@@ -1416,10 +1426,6 @@ def temp_environ(self) -> Iterator[None]:
             os.environ.clear()
             os.environ.update(environ)
 
-    def unset_env(self, key: str) -> None:
-        if key in os.environ:
-            del os.environ[key]
-
     def _updated_path(self) -> str:
         return os.pathsep.join([str(self._bin_dir), os.environ.get("PATH", "")])
 

tests/masonry/builders/test_editable_builder.py

@@ -120,6 +120,7 @@ def test_builder_installs_proper_files_for_standard_packages(simple_poetry, tmp_
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Project-URL: Documentation, https://python-poetry.org/docs

tests/test_factory.py

@@ -119,6 +119,7 @@ def test_create_poetry():
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ]