remove poetry-core<=1.10a7 compatibility code

src/poetry/mixology/version_solver.py

@@ -19,7 +19,6 @@ from poetry.mixology.result import SolverResult
 from poetry.mixology.set_relation import SetRelation
 from poetry.mixology.term import Term
 from poetry.packages import DependencyPackage
-from poetry.utils._compat import metadata
 
 
 if TYPE_CHECKING:
@@ -47,13 +46,7 @@ class DependencyCache:
             list[DependencyPackage],
         ] = {}
 
-        # TODO: re-enable cache when poetry-core upgrade is completed
-        self.search_for = functools.lru_cache(
-            maxsize=128
-            if metadata.version("poetry-core")  # type: ignore[no-untyped-call]
-            != "1.1.0a7"
-            else 0
-        )(self._search_for)
+        self.search_for = functools.lru_cache(maxsize=128)(self._search_for)
 
     def _search_for(self, dependency: Dependency) -> list[DependencyPackage]:
         key = (

src/poetry/puzzle/provider.py

@@ -236,16 +236,6 @@ class Provider:
         Basically, we clone the repository in a temporary directory
         and get the information we need by checking out the specified reference.
         """
-        # TODO: remove explicit subdirectory check once poetry-core is updated
-        # we ensure subdirectory match here as workaround until poetry-core is updated
-        # to >1.1.0a7
-        if (
-            dependency in self._deferred_cache
-            and self._deferred_cache[dependency].source_subdirectory
-            == dependency.source_subdirectory
-        ):
-            return [self._deferred_cache[dependency]]
-
         package = self.get_package_from_vcs(
             dependency.vcs,
             dependency.source,

tests/compat.py

@@ -10,13 +10,3 @@ try:
     from typing import Protocol  # nopycln: import
 except ImportError:
     from typing_extensions import Protocol  # noqa: F401, TC002
-
-from poetry.core.semver.helpers import parse_constraint
-from poetry.core.semver.version import Version
-
-from poetry.utils._compat import metadata
-
-
-is_poetry_core_1_1_0a7_compat = not parse_constraint(">1.1.0a7").allows(
-    Version.parse(metadata.version("poetry-core"))
-)

tests/console/commands/test_add.py

@@ -10,7 +10,6 @@ import pytest
 from poetry.core.semver.version import Version
 
 from poetry.repositories.legacy_repository import LegacyRepository
-from tests.compat import is_poetry_core_1_1_0a7_compat
 from tests.helpers import get_dependency
 from tests.helpers import get_package
 
@@ -993,9 +992,6 @@ Package operations: 1 install, 0 updates, 0 removals
 
   • Installing foo (1.2.3b1)
 """
-    if is_poetry_core_1_1_0a7_compat:
-        expected = expected.replace("^1.2.3b1", "^1.2.3-beta.1")
-
     assert expected in tester.io.fetch_output()
 
 
@@ -1926,9 +1922,6 @@ Package operations: 1 install, 0 updates, 0 removals
 
   - Installing foo (1.2.3b1)
 """
-    if is_poetry_core_1_1_0a7_compat:
-        expected = expected.replace("^1.2.3b1", "^1.2.3-beta.1")
-
     assert expected in old_tester.io.fetch_output()
 
 

tests/console/commands/test_version.py

@@ -5,7 +5,6 @@ from typing import TYPE_CHECKING
 import pytest
 
 from poetry.console.commands.version import VersionCommand
-from tests.compat import is_poetry_core_1_1_0a7_compat
 
 
 if TYPE_CHECKING:
@@ -53,8 +52,6 @@ def tester(command_tester_factory: CommandTesterFactory) -> CommandTester:
 def test_increment_version(
     version: str, rule: str, expected: str, command: VersionCommand
 ):
-    if is_poetry_core_1_1_0a7_compat:
-        expected = expected.replace("a", "-alpha.").replace("b", "-beta.")
     assert command.increment_version(version, rule).text == expected
 
 

tests/mixology/version_solver/test_dependency_cache.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING
 
 from poetry.factory import Factory
 from poetry.mixology.version_solver import DependencyCache
-from tests.compat import is_poetry_core_1_1_0a7_compat
 from tests.mixology.helpers import add_to_repo
 
 
@@ -38,9 +37,8 @@ def test_solver_dependency_cache_respects_source_type(
     packages_pypi = cache.search_for(dependency_pypi)
     packages_git = cache.search_for(dependency_git)
 
-    if not is_poetry_core_1_1_0a7_compat:
-        assert cache.search_for.cache_info().hits == 2
-        assert cache.search_for.cache_info().currsize == 2
+    assert cache.search_for.cache_info().hits == 2
+    assert cache.search_for.cache_info().currsize == 2
 
     assert len(packages_pypi) == len(packages_git) == 1
     assert packages_pypi != packages_git
@@ -95,9 +93,8 @@ def test_solver_dependency_cache_respects_subdirectories(
     packages_one = cache.search_for(dependency_one)
     packages_one_copy = cache.search_for(dependency_one_copy)
 
-    if not is_poetry_core_1_1_0a7_compat:
-        assert cache.search_for.cache_info().hits == 2
-        assert cache.search_for.cache_info().currsize == 2
+    assert cache.search_for.cache_info().hits == 2
+    assert cache.search_for.cache_info().currsize == 2
 
     assert len(packages_one) == len(packages_one_copy) == 1
 

tests/puzzle/test_solver.py

@@ -22,7 +22,6 @@ from poetry.repositories.installed_repository import InstalledRepository
 from poetry.repositories.pool import Pool
 from poetry.repositories.repository import Repository
 from poetry.utils.env import MockEnv
-from tests.compat import is_poetry_core_1_1_0a7_compat
 from tests.helpers import get_dependency
 from tests.helpers import get_package
 from tests.repositories.test_legacy_repository import (
@@ -1384,10 +1383,7 @@ def test_solver_duplicate_dependencies_different_sources_types_are_preserved(
 
     assert len(complete_package.all_requires) == 2
 
-    if is_poetry_core_1_1_0a7_compat:
-        pypi, git = complete_package.all_requires
-    else:
-        git, pypi = complete_package.all_requires
+    git, pypi = complete_package.all_requires
 
     assert isinstance(pypi, Dependency)
     assert pypi == dependency_pypi

tests/utils/test_dependency_specification.py

@@ -8,7 +8,6 @@ import pytest
 from deepdiff import DeepDiff
 
 from poetry.utils.dependency_specification import parse_dependency_specification
-from tests.compat import is_poetry_core_1_1_0a7_compat
 
 
 if TYPE_CHECKING:
@@ -75,9 +74,7 @@ if TYPE_CHECKING:
                 "name": "name",
                 "markers": 'python_version == "2.7"',
                 "url": "http://foo.com",
-                **(
-                    {} if is_poetry_core_1_1_0a7_compat else {"extras": ["fred", "bar"]}
-                ),
+                "extras": ["fred", "bar"],
             },
         ),
         (