chore: compatibility with poetry 1.4, require poetry 1.4, update dev dependencies

.github/workflows/main.yml

@@ -30,16 +30,16 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Get full Python version
         id: full-python-version
-        run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+        run: echo "version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")" >> $GITHUB_OUTPUT
 
       - name: Bootstrap poetry
         run: |
@@ -57,7 +57,7 @@ jobs:
         run: poetry config virtualenvs.in-project true
 
       - name: Set up cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache
         with:
           path: .venv
@@ -68,13 +68,10 @@ jobs:
         run: timeout 10s poetry run pip --version || rm -rf .venv
 
       - name: Install dependencies
-        run: poetry install
-
-      - name: Install pytest plugin
-        run: poetry run pip install pytest-github-actions-annotate-failures
+        run: poetry install --with github-actions
 
       - name: Run mypy
         run: poetry run mypy
 
       - name: Run pytest
-        run: poetry run python -m pytest -p no:sugar -q tests/
+        run: poetry run pytest -v

.github/workflows/release.yml

@@ -11,16 +11,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Install Poetry
         run: |
-          curl -sL https://install.python-poetry.org | python - -y ${{ matrix.bootstrap-args }}
+          curl -sSL https://install.python-poetry.org | python - -y
 
       - name: Update PATH
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
@@ -32,7 +32,7 @@ jobs:
         id: check-version
         run: |
           [[ "$(poetry version --short)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \
-            || echo ::set-output name=prerelease::true
+            || echo prerelease=true >> $GITHUB_OUTPUT
 
       - name: Create Release
         uses: ncipollo/release-action@v1

pyproject.toml

@@ -16,13 +16,19 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.7"
-poetry = "^1.2.0"
+poetry = "^1.4.0"
 
-[tool.poetry.dev-dependencies]
-pre-commit = "^2.6"
-pytest = "^7.1.2"
-pytest-mock = "^3.6.1"
-mypy = ">=0.950"
+[tool.poetry.group.dev.dependencies]
+pre-commit = ">=2.6"
+pytest = ">=7.1.2"
+pytest-mock = ">=3.6.1"
+mypy = ">=1.1.1"
+
+# only used in github actions
+[tool.poetry.group.github-actions]
+optional = true
+[tool.poetry.group.github-actions.dependencies]
+pytest-github-actions-annotate-failures = "^0.1.7"
 
 [tool.poetry.plugins."poetry.application.plugin"]
 export = "poetry_plugin_bundle.plugin:BundleApplicationPlugin"
@@ -58,6 +64,13 @@ module = [
 ]
 ignore_missing_imports = true
 
+
+[tool.pytest.ini_options]
+testpaths = [
+    "tests"
+]
+
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

src/poetry_plugin_bundle/bundlers/venv_bundler.py

@@ -5,7 +5,6 @@
 
 from subprocess import CalledProcessError
 from typing import TYPE_CHECKING
-from typing import cast
 
 from poetry_plugin_bundle.bundlers.bundler import Bundler
 
@@ -14,7 +13,8 @@
     from pathlib import Path
 
     from cleo.io.io import IO
-    from poetry.core.semver.version import Version
+    from cleo.io.outputs.section_output import SectionOutput
+    from poetry.core.constraints.version import Version
     from poetry.poetry import Poetry
 
 
@@ -52,10 +52,10 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
         from tempfile import TemporaryDirectory
 
         from cleo.io.null_io import NullIO
+        from poetry.core.constraints.version import Version
         from poetry.core.masonry.builders.wheel import WheelBuilder
         from poetry.core.masonry.utils.module import ModuleOrPackageNotFound
         from poetry.core.packages.package import Package
-        from poetry.core.semver.version import Version
         from poetry.installation.installer import Installer
         from poetry.installation.operations.install import Install
         from poetry.utils.env import EnvManager
@@ -74,7 +74,7 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
 
         message = self._get_message(poetry, self._path)
         if io.is_decorated() and not io.is_debug():
-            io = io.section()
+            io = io.section()  # type: ignore[assignment]
 
         io.write_line(message)
 
@@ -134,7 +134,10 @@ def bundle(self, poetry: Poetry, io: IO) -> bool:
         if self._activated_groups is not None:
             installer.only_groups(self._activated_groups)
         installer.requires_synchronization()
-        installer.use_executor(poetry.config.get("experimental.new-installer", False))
+        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:
@@ -202,19 +205,17 @@ def _get_message(
             f" (<b>{poetry.package.pretty_version}</b>) into <c2>{path}</c2>"
         )
 
-    def _write(self, io: IO, message: str) -> None:
+    def _write(self, io: IO | SectionOutput, message: str) -> None:
         from cleo.io.outputs.section_output import SectionOutput
 
         if io.is_debug() or not io.is_decorated() or not isinstance(io, SectionOutput):
             io.write_line(message)
             return
 
-        io = cast(SectionOutput, io)
         io.overwrite(message)
 
     def _get_executable_info(self, executable: str) -> tuple[str, Version]:
-        from poetry.core.semver.version import Version
-        from poetry.utils._compat import list_to_shell_command
+        from poetry.core.constraints.version import Version
 
         try:
             python_version = Version.parse(executable)
@@ -227,17 +228,14 @@ def _get_executable_info(self, executable: str) -> tuple[str, Version]:
 
         try:
             python_version_str = subprocess.check_output(
-                list_to_shell_command(
-                    [
-                        executable,
-                        "-c",
-                        (
-                            "\"import sys; print('.'.join([str(s) for s in"
-                            ' sys.version_info[:3]]))"'
-                        ),
-                    ]
-                ),
-                shell=True,
+                [
+                    executable,
+                    "-c",
+                    (
+                        "import sys; print('.'.join([str(s) for s in"
+                        " sys.version_info[:3]]))"
+                    ),
+                ]
             ).decode()
         except CalledProcessError as e:
             from poetry.utils.env import EnvCommandError

src/poetry_plugin_bundle/plugin.py

@@ -22,8 +22,9 @@ def commands(self) -> list[type[Command]]:
         return [BundleVenvCommand]
 
     def activate(self, application: Application) -> None:
+        assert application.event_dispatcher
         application.event_dispatcher.add_listener(
-            COMMAND, self.configure_bundle_commands
+            COMMAND, self.configure_bundle_commands  # type: ignore[arg-type]
         )
         super().activate(application=application)
 

tests/bundlers/test_venv_bundler.py

@@ -13,8 +13,8 @@
 from poetry.core.packages.package import Package
 from poetry.factory import Factory
 from poetry.puzzle.exceptions import SolverProblemError
-from poetry.repositories.pool import Pool
 from poetry.repositories.repository import Repository
+from poetry.repositories.repository_pool import RepositoryPool
 
 from poetry_plugin_bundle.bundlers.venv_bundler import VenvBundler
 
@@ -43,7 +43,7 @@ def poetry(config: Config) -> Poetry:
     )
     poetry.set_config(config)
 
-    pool = Pool()
+    pool = RepositoryPool()
     repository = Repository("repo")
     repository.add_package(Package("foo", "1.0.0"))
     pool.add_repository(repository)
@@ -196,7 +196,7 @@ def test_bundler_should_display_a_warning_for_projects_with_no_module(
     )
     poetry.set_config(config)
 
-    pool = Pool()
+    pool = RepositoryPool()
     repository = Repository("repo")
     repository.add_package(Package("foo", "1.0.0"))
     pool.add_repository(repository)
@@ -235,7 +235,7 @@ def test_bundler_can_filter_dependency_groups(
     # foo is in the main dependency group
     # bar is a dev dependency
     # add a repository for foo but not bar
-    pool = Pool()
+    pool = RepositoryPool()
     repository = Repository("repo")
     repository.add_package(Package("foo", "1.0.0"))
     pool.add_repository(repository)

tests/console/commands/bundle/test_venv.py

@@ -3,6 +3,8 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from poetry.console.application import Application
+
 from poetry_plugin_bundle.bundlers.venv_bundler import VenvBundler
 
 
@@ -32,6 +34,7 @@ def test_venv_calls_venv_bundler(
     assert app_tester.execute("bundle venv /foo --only dev") == 1
     assert app_tester.execute("bundle venv /foo --without main --with dev") == 1
 
+    assert isinstance(app_tester.application, Application)
     assert [
         mocker.call(app_tester.application.poetry, mocker.ANY),
         mocker.call(app_tester.application.poetry, mocker.ANY),

tests/console/conftest.py

@@ -27,7 +27,7 @@ def poetry(project_directory: str, config: Config) -> Poetry:
     p = Factory().create_poetry(
         Path(__file__).parent.parent / "fixtures" / project_directory
     )
-    p.set_locker(TestLocker(p.locker.lock.path, p.locker._local_config))
+    p.set_locker(TestLocker(p.locker.lock, p.locker._local_config))
 
     return p
 

tests/helpers.py

@@ -4,7 +4,6 @@
 from typing import Any
 
 from poetry.console.application import Application
-from poetry.core.toml.file import TOMLFile
 from poetry.factory import Factory
 from poetry.packages import Locker
 
@@ -28,16 +27,13 @@ def reset_poetry(self) -> None:
         self._poetry.set_pool(poetry.pool)
         self._poetry.set_config(poetry.config)
         self._poetry.set_locker(
-            TestLocker(poetry.locker.lock.path, self._poetry.local_config)
+            TestLocker(poetry.locker.lock, self._poetry.local_config)
         )
 
 
 class TestLocker(Locker):
     def __init__(self, lock: str | Path, local_config: dict[str, Any]) -> None:
-        self._lock = TOMLFile(lock)
-        self._local_config = local_config
-        self._lock_data: TOMLDocument | None = None
-        self._content_hash = self._get_content_hash()
+        super().__init__(lock, local_config)
         self._locked = False
         self._write = False