chore: fix comprehensions according to flake8-comprehensions

.pre-commit-config.yaml

@@ -46,6 +46,7 @@ repos:
       - id: flake8
       - id: flake8
         additional_dependencies:
         additional_dependencies:
           - flake8-bugbear==21.9.2
           - flake8-bugbear==21.9.2
+          - flake8-comprehensions==3.7.0
 
 
   - repo: https://github.com/pre-commit/mirrors-mypy
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.910-1
     rev: v0.910-1

src/poetry/console/commands/cache/list.py

@@ -14,7 +14,7 @@ class CacheListCommand(Command):
         from poetry.locations import REPOSITORY_CACHE_DIR
         from poetry.locations import REPOSITORY_CACHE_DIR
 
 
         if os.path.exists(str(REPOSITORY_CACHE_DIR)):
         if os.path.exists(str(REPOSITORY_CACHE_DIR)):
-            caches = list(sorted(REPOSITORY_CACHE_DIR.iterdir()))
+            caches = sorted(REPOSITORY_CACHE_DIR.iterdir())
             if caches:
             if caches:
                 for cache in caches:
                 for cache in caches:
                     self.line("<info>{}</>".format(cache.name))
                     self.line("<info>{}</>".format(cache.name))

src/poetry/console/commands/init.py

@@ -414,7 +414,7 @@ The <c1>init</c1> command creates a basic <comment>pyproject.toml</> file in the
                     parsed = ParsedUrl.parse(requirement)
                     parsed = ParsedUrl.parse(requirement)
                     url = Git.normalize_url(requirement)
                     url = Git.normalize_url(requirement)
 
 
-                    pair = dict([("name", parsed.name), ("git", url.url)])
+                    pair = {"name": parsed.name, "git": url.url}
                     if parsed.rev:
                     if parsed.rev:
                         pair["rev"] = url.revision
                         pair["rev"] = url.revision
 
 
@@ -431,7 +431,7 @@ The <c1>init</c1> command creates a basic <comment>pyproject.toml</> file in the
                 elif url_parsed.scheme in ["http", "https"]:
                 elif url_parsed.scheme in ["http", "https"]:
                     package = Provider.get_package_from_url(requirement)
                     package = Provider.get_package_from_url(requirement)
 
 
-                    pair = dict([("name", package.name), ("url", package.source_url)])
+                    pair = {"name": package.name, "url": package.source_url}
                     if extras:
                     if extras:
                         pair["extras"] = extras
                         pair["extras"] = extras
 
 
@@ -475,7 +475,7 @@ The <c1>init</c1> command creates a basic <comment>pyproject.toml</> file in the
             )
             )
             pair = pair.strip()
             pair = pair.strip()
 
 
-            require = dict()
+            require = {}
             if " " in pair:
             if " " in pair:
                 name, version = pair.split(" ", 2)
                 name, version = pair.split(" ", 2)
                 extras_m = re.search(r"\[([\w\d,-_]+)\]$", name)
                 extras_m = re.search(r"\[([\w\d,-_]+)\]$", name)

src/poetry/console/commands/show.py

@@ -163,7 +163,7 @@ lists all packages available."""
         with solver.use_environment(self.env):
         with solver.use_environment(self.env):
             ops = solver.solve().calculate_operations()
             ops = solver.solve().calculate_operations()
 
 
-        required_locked_packages = set([op.package for op in ops if not op.skipped])
+        required_locked_packages = {op.package for op in ops if not op.skipped}
 
 
         if package:
         if package:
             pkg = None
             pkg = None

src/poetry/factory.py

@@ -221,7 +221,7 @@ class Factory(BaseFactory):
                 constraint["markers"] = str(dep.marker)
                 constraint["markers"] = str(dep.marker)
 
 
             if dep.extras:
             if dep.extras:
-                constraint["extras"] = list(sorted(dep.extras))
+                constraint["extras"] = sorted(dep.extras)
 
 
             if len(constraint) == 1 and "version" in constraint:
             if len(constraint) == 1 and "version" in constraint:
                 constraint = constraint["version"]
                 constraint = constraint["version"]

src/poetry/installation/executor.py

@@ -84,7 +84,7 @@ class Executor:
         self._executed_operations = 0
         self._executed_operations = 0
         self._executed = {"install": 0, "update": 0, "uninstall": 0}
         self._executed = {"install": 0, "update": 0, "uninstall": 0}
         self._skipped = {"install": 0, "update": 0, "uninstall": 0}
         self._skipped = {"install": 0, "update": 0, "uninstall": 0}
-        self._sections = dict()
+        self._sections = {}
         self._lock = threading.Lock()
         self._lock = threading.Lock()
         self._shutdown = False
         self._shutdown = False
         self._hashes: Dict[str, str] = {}
         self._hashes: Dict[str, str] = {}
@@ -150,7 +150,7 @@ class Executor:
 
 
         # We group operations by priority
         # We group operations by priority
         groups = itertools.groupby(operations, key=lambda o: -o.priority)
         groups = itertools.groupby(operations, key=lambda o: -o.priority)
-        self._sections = dict()
+        self._sections = {}
         for _, group in groups:
         for _, group in groups:
             tasks = []
             tasks = []
             serial_operations = []
             serial_operations = []

src/poetry/mixology/partial_solution.py

@@ -28,13 +28,13 @@ class PartialSolution:
         self._assignments: List[Assignment] = []
         self._assignments: List[Assignment] = []
 
 
         # The decisions made for each package.
         # The decisions made for each package.
-        self._decisions: Dict[str, "Package"] = dict()
+        self._decisions: Dict[str, "Package"] = {}
 
 
         # The intersection of all positive Assignments for each package, minus any
         # The intersection of all positive Assignments for each package, minus any
         # negative Assignments that refer to that package.
         # negative Assignments that refer to that package.
         #
         #
         # This is derived from self._assignments.
         # This is derived from self._assignments.
-        self._positive: Dict[str, Term] = dict()
+        self._positive: Dict[str, Term] = {}
 
 
         # The union of all negative Assignments for each package.
         # The union of all negative Assignments for each package.
         #
         #
@@ -42,7 +42,7 @@ class PartialSolution:
         # map.
         # map.
         #
         #
         # This is derived from self._assignments.
         # This is derived from self._assignments.
-        self._negative: Dict[str, Dict[str, Term]] = dict()
+        self._negative: Dict[str, Dict[str, Term]] = {}
 
 
         # The number of distinct solutions that have been attempted so far.
         # The number of distinct solutions that have been attempted so far.
         self._attempted_solutions = 1
         self._attempted_solutions = 1

src/poetry/packages/locker.py

@@ -327,7 +327,7 @@ class Locker:
             pinned_versions=pinned_versions,
             pinned_versions=pinned_versions,
             packages_by_name=packages_by_name,
             packages_by_name=packages_by_name,
             project_level_dependencies=project_level_dependencies,
             project_level_dependencies=project_level_dependencies,
-            nested_dependencies=dict(),
+            nested_dependencies={},
         )
         )
 
 
         # Merge same dependencies using marker union
         # Merge same dependencies using marker union
@@ -424,14 +424,12 @@ class Locker:
                 for extra, deps in sorted(root.extras.items())
                 for extra, deps in sorted(root.extras.items())
             }
             }
 
 
-        lock["metadata"] = dict(
-            [
-                ("lock-version", self._VERSION),
-                ("python-versions", root.python_versions),
-                ("content-hash", self._content_hash),
-                ("files", files),
-            ]
-        )
+        lock["metadata"] = {
+            "lock-version": self._VERSION,
+            "python-versions": root.python_versions,
+            "content-hash": self._content_hash,
+            "files": files,
+        }
 
 
         if not self.is_locked() or lock != self.lock_data:
         if not self.is_locked() or lock != self.lock_data:
             self._write_lock_data(lock)
             self._write_lock_data(lock)
@@ -556,17 +554,15 @@ class Locker:
                     constraint["version"] for constraint in constraints
                     constraint["version"] for constraint in constraints
                 ]
                 ]
 
 
-        data = dict(
-            [
-                ("name", package.pretty_name),
-                ("version", package.pretty_version),
-                ("description", package.description or ""),
-                ("category", package.category),
-                ("optional", package.optional),
-                ("python-versions", package.python_versions),
-                ("files", sorted(package.files, key=lambda x: x["file"])),
-            ]
-        )
+        data = {
+            "name": package.pretty_name,
+            "version": package.pretty_version,
+            "description": package.description or "",
+            "category": package.category,
+            "optional": package.optional,
+            "python-versions": package.python_versions,
+            "files": sorted(package.files, key=lambda x: x["file"]),
+        }
 
 
         if dependencies:
         if dependencies:
             data["dependencies"] = table()
             data["dependencies"] = table()
@@ -600,7 +596,7 @@ class Locker:
                     )
                     )
                 ).as_posix()
                 ).as_posix()
 
 
-            data["source"] = dict()
+            data["source"] = {}
 
 
             if package.source_type:
             if package.source_type:
                 data["source"]["type"] = package.source_type
                 data["source"]["type"] = package.source_type

src/poetry/puzzle/provider.py

@@ -543,7 +543,7 @@ class Provider:
         # An example of this is:
         # An example of this is:
         #   - pypiwin32 (220); sys_platform == "win32" and python_version >= "3.6"
         #   - pypiwin32 (220); sys_platform == "win32" and python_version >= "3.6"
         #   - pypiwin32 (219); sys_platform == "win32" and python_version < "3.6"
         #   - pypiwin32 (219); sys_platform == "win32" and python_version < "3.6"
-        duplicates = dict()
+        duplicates = {}
         for dep in dependencies:
         for dep in dependencies:
             if dep.complete_name not in duplicates:
             if dep.complete_name not in duplicates:
                 duplicates[dep.complete_name] = []
                 duplicates[dep.complete_name] = []
@@ -559,7 +559,7 @@ class Provider:
             self.debug(f"<debug>Duplicate dependencies for {dep_name}</debug>")
             self.debug(f"<debug>Duplicate dependencies for {dep_name}</debug>")
 
 
             # Regrouping by constraint
             # Regrouping by constraint
-            by_constraint = dict()
+            by_constraint = {}
             for dep in deps:
             for dep in deps:
                 if dep.constraint not in by_constraint:
                 if dep.constraint not in by_constraint:
                     by_constraint[dep.constraint] = []
                     by_constraint[dep.constraint] = []

src/poetry/repositories/pypi_repository.py

@@ -414,7 +414,7 @@ class PyPiRepository(RemoteRepository):
                         )
                         )
                         requires_dist.append(dep.to_pep_508())
                         requires_dist.append(dep.to_pep_508())
 
 
-                    info.requires_dist = sorted(list(set(requires_dist)))
+                    info.requires_dist = sorted(set(requires_dist))
 
 
             if info:
             if info:
                 return info
                 return info

src/poetry/utils/env.py

@@ -836,11 +836,10 @@ class EnvManager:
                 )
                 )
             )
             )
 
 
-            for python_to_try in reversed(
-                sorted(
+            for python_to_try in sorted(
                 self._poetry.package.AVAILABLE_PYTHONS,
                 self._poetry.package.AVAILABLE_PYTHONS,
                 key=lambda v: (v.startswith("3"), -len(v), v),
                 key=lambda v: (v.startswith("3"), -len(v), v),
-                )
+                reverse=True,
             ):
             ):
                 if len(python_to_try) == 1:
                 if len(python_to_try) == 1:
                     if not parse_constraint(f"^{python_to_try}.0").allows_any(
                     if not parse_constraint(f"^{python_to_try}.0").allows_any(

tests/installation/test_installer.py

@@ -593,15 +593,12 @@ def test_run_install_with_optional_group_selected(
 
 
 @pytest.mark.parametrize(
 @pytest.mark.parametrize(
     "managed_reserved_package_names",
     "managed_reserved_package_names",
-    [
-        i
-        for i in itertools.chain(
-            [tuple()],
+    itertools.chain(
+        [()],
         itertools.permutations(RESERVED_PACKAGES, 1),
         itertools.permutations(RESERVED_PACKAGES, 1),
         itertools.permutations(RESERVED_PACKAGES, 2),
         itertools.permutations(RESERVED_PACKAGES, 2),
         [RESERVED_PACKAGES],
         [RESERVED_PACKAGES],
-        )
-    ],
+    ),
 )
 )
 def test_run_install_with_synchronization(
 def test_run_install_with_synchronization(
     managed_reserved_package_names, installer, locker, repo, package, installed
     managed_reserved_package_names, installer, locker, repo, package, installed
@@ -672,7 +669,7 @@ def test_run_install_with_synchronization(
         *managed_reserved_package_names,
         *managed_reserved_package_names,
     }
     }
 
 
-    assert expected_removals == set(r.name for r in installer.executor.removals)
+    assert expected_removals == {r.name for r in installer.executor.removals}
 
 
 
 
 def test_run_whitelist_add(installer, locker, repo, package):
 def test_run_whitelist_add(installer, locker, repo, package):

tests/installation/test_installer_old.py

@@ -295,15 +295,12 @@ def test_run_install_no_group(installer, locker, repo, package, installed):
 
 
 @pytest.mark.parametrize(
 @pytest.mark.parametrize(
     "managed_reserved_package_names",
     "managed_reserved_package_names",
-    [
-        i
-        for i in itertools.chain(
-            [tuple()],
+    itertools.chain(
+        [()],
         itertools.permutations(RESERVED_PACKAGES, 1),
         itertools.permutations(RESERVED_PACKAGES, 1),
         itertools.permutations(RESERVED_PACKAGES, 2),
         itertools.permutations(RESERVED_PACKAGES, 2),
         [RESERVED_PACKAGES],
         [RESERVED_PACKAGES],
-        )
-    ],
+    ),
 )
 )
 def test_run_install_with_synchronization(
 def test_run_install_with_synchronization(
     managed_reserved_package_names, installer, locker, repo, package, installed
     managed_reserved_package_names, installer, locker, repo, package, installed
@@ -377,7 +374,7 @@ def test_run_install_with_synchronization(
         package_c.name,
         package_c.name,
         *managed_reserved_package_names,
         *managed_reserved_package_names,
     }
     }
-    assert set(r.name for r in removals) == expected_removals
+    assert {r.name for r in removals} == expected_removals
 
 
 
 
 def test_run_whitelist_add(installer, locker, repo, package):
 def test_run_whitelist_add(installer, locker, repo, package):

tests/utils/test_authenticator.py

@@ -173,7 +173,7 @@ def test_authenticator_request_retries_on_exception(mocker, config, http):
     sleep = mocker.patch("time.sleep")
     sleep = mocker.patch("time.sleep")
     sdist_uri = "https://foo.bar/files/{}/foo-0.1.0.tar.gz".format(str(uuid.uuid4()))
     sdist_uri = "https://foo.bar/files/{}/foo-0.1.0.tar.gz".format(str(uuid.uuid4()))
     content = str(uuid.uuid4())
     content = str(uuid.uuid4())
-    seen = list()
+    seen = []
 
 
     def callback(request, uri, response_headers):
     def callback(request, uri, response_headers):
         if seen.count(uri) < 2:
         if seen.count(uri) < 2:

tests/utils/test_exporter.py

@@ -482,12 +482,12 @@ def test_exporter_can_export_requirements_txt_with_nested_packages_and_markers_a
     root = poetry.package.with_dependency_groups([], only=True)
     root = poetry.package.with_dependency_groups([], only=True)
     root.add_dependency(
     root.add_dependency(
         Factory.create_dependency(
         Factory.create_dependency(
-            name="a", constraint=dict(version="^1.2.3", python="<3.8")
+            name="a", constraint={"version": "^1.2.3", "python": "<3.8"}
         )
         )
     )
     )
     root.add_dependency(
     root.add_dependency(
         Factory.create_dependency(
         Factory.create_dependency(
-            name="b", constraint=dict(version="^4.5.6"), groups=["dev"]
+            name="b", constraint={"version": "^4.5.6"}, groups=["dev"]
         )
         )
     )
     )
     poetry._package = root
     poetry._package = root