update poetry-core to 1.1.0b1

pyproject.toml

@@ -44,7 +44,7 @@ generate-setup-file = false
 [tool.poetry.dependencies]
 python = "^3.7"
 
-poetry-core = "^1.1.0a7"
+poetry-core = "^1.1.0b1"
 poetry-plugin-export = "^1.0.2"
 cachecontrol = { version = "^0.12.9", extras = ["filecache"] }
 cachy = "^0.3.0"

src/poetry/console/commands/show.py

@@ -393,7 +393,7 @@ def display_package_tree(
             dependencies = package.requires
             dependencies = sorted(
                 dependencies,
-                key=lambda x: x.name,  # type: ignore[no-any-return]
+                key=lambda x: x.name,
             )
 
         tree_bar = "├"
@@ -437,7 +437,7 @@ def _display_tree(
 
         dependencies = sorted(
             dependencies,
-            key=lambda x: x.name,  # type: ignore[no-any-return]
+            key=lambda x: x.name,
         )
         tree_bar = previous_tree_bar + "   ├"
         total = len(dependencies)

src/poetry/factory.py

@@ -41,7 +41,7 @@
 logger = logging.getLogger(__name__)
 
 
-class Factory(BaseFactory):  # type: ignore[misc]
+class Factory(BaseFactory):
     """
     Factory class to create various elements needed by Poetry.
     """

src/poetry/masonry/builders/editable.py

@@ -40,7 +40,7 @@
 """
 
 
-class EditableBuilder(Builder):  # type: ignore[misc]
+class EditableBuilder(Builder):
     def __init__(self, poetry: Poetry, env: Env, io: IO) -> None:
         super().__init__(poetry)
 

src/poetry/mixology/version_solver.py

@@ -19,7 +19,6 @@
 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 @@ def __init__(self, provider: Provider) -> None:
             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/packages/locker.py

@@ -309,7 +309,7 @@ def get_project_dependencies(
         # Put higher versions first so that we prefer them.
         for packages in packages_by_name.values():
             packages.sort(
-                key=lambda package: package.version,  # type: ignore[no-any-return]
+                key=lambda package: package.version,
                 reverse=True,
             )
 
@@ -493,7 +493,7 @@ def _dump_package(self, package: Package) -> dict[str, Any]:
         dependencies: dict[str, list[Any]] = {}
         for dependency in sorted(
             package.requires,
-            key=lambda d: d.name,  # type: ignore[no-any-return]
+            key=lambda d: d.name,
         ):
             if dependency.pretty_name not in dependencies:
                 dependencies[dependency.pretty_name] = []

src/poetry/poetry.py

@@ -20,7 +20,7 @@
     from poetry.repositories.pool import Pool
 
 
-class Poetry(BasePoetry):  # type: ignore[misc]
+class Poetry(BasePoetry):
 
     VERSION = __version__
 

src/poetry/puzzle/provider.py

@@ -236,16 +236,6 @@ def search_for_vcs(self, dependency: VCSDependency) -> list[Package]:
         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,

src/poetry/puzzle/solver.py

@@ -141,7 +141,7 @@ def _solve(
             )
         for dependency_packages in locked.values():
             dependency_packages.sort(
-                key=lambda p: p.package.version,  # type: ignore[no-any-return]
+                key=lambda p: p.package.version,
                 reverse=True,
             )
 

tests/compat.py

@@ -10,13 +10,3 @@
     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"))
-)