From 07f5e0fa54955f2417e5ddb754d04c9efef316d1 Mon Sep 17 00:00:00 2001 From: Bart Kamphorst Date: Fri, 14 Oct 2022 21:33:32 +0200 Subject: [PATCH 1/2] fix: update import of deprecated repository modules --- src/poetry_plugin_export/exporter.py | 2 +- tests/conftest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/poetry_plugin_export/exporter.py b/src/poetry_plugin_export/exporter.py index 1f97c41..617fa23 100644 --- a/src/poetry_plugin_export/exporter.py +++ b/src/poetry_plugin_export/exporter.py @@ -8,7 +8,7 @@ from cleo.io.io import IO from poetry.core.packages.dependency_group import MAIN_GROUP -from poetry.repositories.http import HTTPRepository +from poetry.repositories.http_repository import HTTPRepository from poetry_plugin_export.walker import get_project_dependency_packages diff --git a/tests/conftest.py b/tests/conftest.py index 2a61753..8b6f2a4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,8 +13,8 @@ from poetry.core.packages.package import Package from poetry.factory import Factory from poetry.layouts import layout -from poetry.repositories import Pool from poetry.repositories import Repository +from poetry.repositories import RepositoryPool from poetry.utils.env import SystemEnv from tests.helpers import TestLocker @@ -177,7 +177,7 @@ def _factory( poetry.set_locker(locker) poetry.set_config(config) - pool = Pool() + pool = RepositoryPool() pool.add_repository(repo) poetry.set_pool(pool) From 0dc2daf3c99c3bd51f6c057e21bfcbb7e84a2889 Mon Sep 17 00:00:00 2001 From: Bart Kamphorst Date: Mon, 31 Oct 2022 21:55:32 +0100 Subject: [PATCH 2/2] fix: backwards compatibility --- src/poetry_plugin_export/exporter.py | 9 ++++++++- tests/conftest.py | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/poetry_plugin_export/exporter.py b/src/poetry_plugin_export/exporter.py index 617fa23..f4dafc1 100644 --- a/src/poetry_plugin_export/exporter.py +++ b/src/poetry_plugin_export/exporter.py @@ -8,7 +8,14 @@ from cleo.io.io import IO from poetry.core.packages.dependency_group import MAIN_GROUP -from poetry.repositories.http_repository import HTTPRepository + + +try: + from poetry.repositories.http_repository import ( # type: ignore[import] # noqa: E501 + HTTPRepository, + ) +except ImportError: # poetry<1.3.0 + from poetry.repositories.http import HTTPRepository from poetry_plugin_export.walker import get_project_dependency_packages diff --git a/tests/conftest.py b/tests/conftest.py index 8b6f2a4..cf04914 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,7 +14,15 @@ from poetry.factory import Factory from poetry.layouts import layout from poetry.repositories import Repository -from poetry.repositories import RepositoryPool + + +try: + from poetry.repositories.repository_pool import ( # type: ignore[import] # noqa: E501 + RepositoryPool, + ) +except ImportError: # poetry<1.3.0 + from poetry.repositories.pool import Pool as RepositoryPool + from poetry.utils.env import SystemEnv from tests.helpers import TestLocker