chore: compatibility with poetry 1.5, require poetry 1.5, update dev dependencies (#61)

Author: radoering

poetry.lock

@@ -16,7 +16,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.7"
-poetry = "^1.4.0"
+poetry = "^1.5.0"
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = ">=2.6"

pyproject.toml

@@ -3,15 +3,14 @@
 import subprocess
 import sys
 
+from pathlib import Path
 from subprocess import CalledProcessError
 from typing import TYPE_CHECKING
 
 from poetry_plugin_bundle.bundlers.bundler import Bundler
 
 
 if TYPE_CHECKING:
-    from pathlib import Path
-
     from cleo.io.io import IO
     from cleo.io.outputs.section_output import SectionOutput
     from poetry.core.constraints.version import Version
@@ -32,7 +31,7 @@ def set_path(self, path: Path) -> VenvBundler:
 
         return self
 
-    def set_executable(self, executable: str) -> VenvBundler:
+    def set_executable(self, executable: str | None) -> VenvBundler:
         self._executable = executable
 
         return self
@@ -65,10 +64,10 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
         warnings = []
 
         manager = EnvManager(poetry)
-        executable = self._executable
-        if self._executable is not None:
+        if self._executable:
             executable, python_version = self._get_executable_info(self._executable)
         else:
+            executable = None
             version_info = SystemEnv(Path(sys.prefix)).get_version_info()
             python_version = Version.parse(".".join(str(v) for v in version_info[:3]))
 
@@ -93,7 +92,7 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
                     io, f"{message}: <info>Removing existing virtual environment</info>"
                 )
 
-                manager.remove_venv(str(self._path))
+                manager.remove_venv(self._path)
 
                 self._write(
                     io,
@@ -103,7 +102,7 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
                     ),
                 )
 
-                manager.build_venv(str(self._path), executable=executable)
+                manager.build_venv(self._path, executable=executable)
             else:
                 self._write(
                     io, f"{message}: <info>Using existing virtual environment</info>"
@@ -117,7 +116,7 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
                 ),
             )
 
-            manager.build_venv(str(self._path), executable=executable)
+            manager.build_venv(self._path, executable=executable)
 
         env = VirtualEnv(self._path)
 
@@ -134,10 +133,6 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
         if self._activated_groups is not None:
             installer.only_groups(self._activated_groups)
         installer.requires_synchronization()
-        use_executor = poetry.config.get("experimental.new-installer", False)
-        if not use_executor:
-            # only set if false because the method is deprecated
-            installer.use_executor(False)
 
         return_code = installer.run()
         if return_code:
@@ -214,7 +209,7 @@ def _write(self, io: IO | SectionOutput, message: str) -> None:
 
         io.overwrite(message)
 
-    def _get_executable_info(self, executable: str) -> tuple[str, Version]:
+    def _get_executable_info(self, executable: str) -> tuple[Path, Version]:
         from poetry.core.constraints.version import Version
 
         try:
@@ -244,4 +239,4 @@ def _get_executable_info(self, executable: str) -> tuple[str, Version]:
 
         python_version = Version.parse(python_version_str.strip())
 
-        return executable, python_version
+        return Path(executable), python_version

src/poetry_plugin_bundle/bundlers/venv_bundler.py

@@ -73,7 +73,7 @@ def config(
 def tmp_venv(tmp_path: Path) -> Iterator[VirtualEnv]:
     venv_path = tmp_path / "venv"
 
-    EnvManager.build_venv(str(venv_path))
+    EnvManager.build_venv(venv_path)
 
     venv = VirtualEnv(venv_path)
     yield venv

tests/conftest.py

@@ -25,6 +25,10 @@ classifiers = [
 python = "~2.7 || ^3.4"
 foo = "^1.0.0"
 
+[tool.poetry.group.dev]
+optional = true
+dependencies = {}
+
 [tool.poetry.scripts]
 foo = "foo:bar"
 baz = "bar:baz.boom.bim"

tests/fixtures/simple_project/pyproject.toml

@@ -32,7 +32,7 @@ def reset_poetry(self) -> None:
 
 
 class TestLocker(Locker):
-    def __init__(self, lock: str | Path, local_config: dict[str, Any]) -> None:
+    def __init__(self, lock: Path, local_config: dict[str, Any]) -> None:
         super().__init__(lock, local_config)
         self._locked = False
         self._write = False