From b2df66756314ded097c01913de7ff1b2eba73aec Mon Sep 17 00:00:00 2001
From: Arun Babu Neelicattu <arun.neelicattu@gmail.com>
Date: Mon, 9 May 2022 16:12:55 +0200
Subject: [PATCH 1/2] mypy: remove unused ignores

---
 src/poetry/console/commands/show.py     | 4 ++--
 src/poetry/factory.py                   | 2 +-
 src/poetry/masonry/builders/editable.py | 2 +-
 src/poetry/packages/locker.py           | 4 ++--
 src/poetry/packages/project_package.py  | 2 +-
 src/poetry/poetry.py                    | 2 +-
 src/poetry/puzzle/solver.py             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/poetry/console/commands/show.py b/src/poetry/console/commands/show.py
index 74c92af9ea4..13ffff3e6fb 100644
--- a/src/poetry/console/commands/show.py
+++ b/src/poetry/console/commands/show.py
@@ -300,7 +300,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 = "├"
         total = len(dependencies)
@@ -343,7 +343,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)
diff --git a/src/poetry/factory.py b/src/poetry/factory.py
index b302337dfb8..e9a8084ac07 100644
--- a/src/poetry/factory.py
+++ b/src/poetry/factory.py
@@ -43,7 +43,7 @@
 logger = logging.getLogger(__name__)
 
 
-class Factory(BaseFactory):  # type: ignore[misc]
+class Factory(BaseFactory):
     """
     Factory class to create various elements needed by Poetry.
     """
diff --git a/src/poetry/masonry/builders/editable.py b/src/poetry/masonry/builders/editable.py
index 73329b480ec..a5f7c586b68 100644
--- a/src/poetry/masonry/builders/editable.py
+++ b/src/poetry/masonry/builders/editable.py
@@ -39,7 +39,7 @@
 """
 
 
-class EditableBuilder(Builder):  # type: ignore[misc]
+class EditableBuilder(Builder):
     def __init__(self, poetry: Poetry, env: Env, io: IO) -> None:
         super().__init__(poetry)
 
diff --git a/src/poetry/packages/locker.py b/src/poetry/packages/locker.py
index a12dc7476e2..5890da6a595 100644
--- a/src/poetry/packages/locker.py
+++ b/src/poetry/packages/locker.py
@@ -308,7 +308,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,
             )
 
@@ -492,7 +492,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] = []
diff --git a/src/poetry/packages/project_package.py b/src/poetry/packages/project_package.py
index f2801fc5bdf..698c3aa1822 100644
--- a/src/poetry/packages/project_package.py
+++ b/src/poetry/packages/project_package.py
@@ -9,7 +9,7 @@
     from poetry.core.semver.version import Version
 
 
-class ProjectPackage(_ProjectPackage):  # type: ignore[misc]
+class ProjectPackage(_ProjectPackage):
     def set_version(
         self, version: str | Version, pretty_version: str | None = None
     ) -> None:
diff --git a/src/poetry/poetry.py b/src/poetry/poetry.py
index 6f571aeeaea..c8f9d1c483f 100644
--- a/src/poetry/poetry.py
+++ b/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__
 
diff --git a/src/poetry/puzzle/solver.py b/src/poetry/puzzle/solver.py
index f4a441f20f3..8dd211a8f5b 100644
--- a/src/poetry/puzzle/solver.py
+++ b/src/poetry/puzzle/solver.py
@@ -140,7 +140,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,
             )
 

From b19dbd1df0a12e9d62004367daefb0d08f3f29de Mon Sep 17 00:00:00 2001
From: Arun Babu Neelicattu <arun.neelicattu@gmail.com>
Date: Mon, 9 May 2022 17:04:32 +0200
Subject: [PATCH 2/2] try a fresh cache

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ec26ceb18a0..9c73680468b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,7 +70,7 @@ jobs:
         id: cache
         with:
           path: .venv
-          key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
+          key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}-x
 
       - name: Ensure cache is healthy
         if: steps.cache.outputs.cache-hit == 'true'