[pre-commit.ci] pre-commit autoupdate (#8136)

Co-authored-by: Bartek Sokorski <[email protected]>
python-poetry · Jul 19, 2023 · c71deb4 · c71deb4
1 parent fd717ca
commit c71deb4
Show file tree

Hide file tree

Showing 33 changed files with 136 additions and 206 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: check-docstring-first
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
 
@@ -30,7 +30,7 @@ repos:
     hooks:
       - id: validate_manifest
 
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.272
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.278
     hooks:
     -   id: ruff
diff --git a/pyproject.toml b/pyproject.toml
@@ -135,6 +135,9 @@ known-first-party = ["poetry"]
 known-third-party = ["poetry.core"]
 required-imports = ["from __future__ import annotations"]
 
+[tool.ruff.per-file-ignores]
+"src/poetry/console/*" = ["RUF012"]  # Can't annotate properly until new version of Cleo
+
 [tool.black]
 target-version = ['py38']
 preview = true

diff --git a/src/poetry/config/config.py b/src/poetry/config/config.py
@@ -9,6 +9,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
+from typing import ClassVar
 
 from packaging.utils import canonicalize_name
 
@@ -104,7 +105,7 @@ def validator(cls, policy: str) -> bool:
 
 
 class Config:
-    default_config: dict[str, Any] = {
+    default_config: ClassVar[dict[str, Any]] = {
         "cache-dir": str(DEFAULT_CACHE_DIR),
         "virtualenvs": {
             "create": True,

diff --git a/src/poetry/config/source.py b/src/poetry/config/source.py
@@ -21,11 +21,9 @@ def __post_init__(self, default: bool, secondary: bool) -> None:
             self.priority = Priority[self.priority.upper()]
         if default or secondary:
             warnings.warn(
-                (
-                    "Parameters 'default' and 'secondary' to"
-                    " 'Source' are deprecated. Please provide"
-                    " 'priority' instead."
-                ),
+                "Parameters 'default' and 'secondary' to"
+                " 'Source' are deprecated. Please provide"
+                " 'priority' instead.",
                 DeprecationWarning,
                 stacklevel=2,
             )

diff --git a/src/poetry/console/commands/add.py b/src/poetry/console/commands/add.py
@@ -30,10 +30,8 @@ class AddCommand(InstallerCommand, InitCommand):
         option(
             "dev",
             "D",
-            (
-                "Add as a development dependency. (<warning>Deprecated</warning>) Use"
-                " --group=dev instead."
-            ),
+            "Add as a development dependency. (<warning>Deprecated</warning>) Use"
+            " --group=dev instead.",
         ),
         option("editable", "e", "Add vcs/path dependencies as editable."),
         option(
@@ -66,10 +64,8 @@ class AddCommand(InstallerCommand, InitCommand):
         option(
             "dry-run",
             None,
-            (
-                "Output the operations but do not execute anything (implicitly enables"
-                " --verbose)."
-            ),
+            "Output the operations but do not execute anything (implicitly enables"
+            " --verbose).",
         ),
         option("lock", None, "Do not perform operations (only update the lockfile)."),
     ]

diff --git a/src/poetry/console/commands/check.py b/src/poetry/console/commands/check.py
@@ -22,10 +22,8 @@ class CheckCommand(Command):
         option(
             "lock",
             None,
-            (
-                "Checks that <comment>poetry.lock</> exists for the current"
-                " version of <comment>pyproject.toml</>."
-            ),
+            "Checks that <comment>poetry.lock</> exists for the current"
+            " version of <comment>pyproject.toml</>.",
         ),
     ]
 

diff --git a/src/poetry/console/commands/env/remove.py b/src/poetry/console/commands/env/remove.py
@@ -13,10 +13,8 @@ class EnvRemoveCommand(Command):
     arguments = [
         argument(
             "python",
-            (
-                "The python executables associated with, or names of the virtual"
-                " environments which are to be removed."
-            ),
+            "The python executables associated with, or names of the virtual"
+            " environments which are to be removed.",
             optional=True,
             multiple=True,
         )

diff --git a/src/poetry/console/commands/init.py b/src/poetry/console/commands/init.py
@@ -40,20 +40,16 @@ class InitCommand(Command):
         option(
             "dependency",
             None,
-            (
-                "Package to require, with an optional version constraint, "
-                "e.g. requests:^2.10.0 or requests=2.11.1."
-            ),
+            "Package to require, with an optional version constraint, "
+            "e.g. requests:^2.10.0 or requests=2.11.1.",
             flag=False,
             multiple=True,
         ),
         option(
             "dev-dependency",
             None,
-            (
-                "Package to require for development, with an optional version"
-                " constraint, e.g. requests:^2.10.0 or requests=2.11.1."
-            ),
+            "Package to require for development, with an optional version"
+            " constraint, e.g. requests:^2.10.0 or requests=2.11.1.",
             flag=False,
             multiple=True,
         ),
@@ -330,10 +326,8 @@ def _determine_requirements(
                     choices.append("")
 
                     package = self.choice(
-                        (
-                            "\nEnter package # to add, or the complete package name if"
-                            " it is not listed"
-                        ),
+                        "\nEnter package # to add, or the complete package name if"
+                        " it is not listed",
                         choices,
                         attempts=3,
                         default=len(choices) - 1,

diff --git a/src/poetry/console/commands/install.py b/src/poetry/console/commands/install.py
@@ -14,47 +14,37 @@ class InstallCommand(InstallerCommand):
         option(
             "no-dev",
             None,
-            (
-                "Do not install the development dependencies."
-                " (<warning>Deprecated</warning>)"
-            ),
+            "Do not install the development dependencies."
+            " (<warning>Deprecated</warning>)",
         ),
         option(
             "sync",
             None,
-            (
-                "Synchronize the environment with the locked packages and the specified"
-                " groups."
-            ),
+            "Synchronize the environment with the locked packages and the specified"
+            " groups.",
         ),
         option(
             "no-root", None, "Do not install the root package (the current project)."
         ),
         option(
             "no-directory",
             None,
-            (
-                "Do not install any directory path dependencies; useful to install"
-                " dependencies without source code, e.g. for caching of Docker layers)"
-            ),
+            "Do not install any directory path dependencies; useful to install"
+            " dependencies without source code, e.g. for caching of Docker layers)",
             flag=True,
             multiple=False,
         ),
         option(
             "dry-run",
             None,
-            (
-                "Output the operations but do not execute anything "
-                "(implicitly enables --verbose)."
-            ),
+            "Output the operations but do not execute anything "
+            "(implicitly enables --verbose).",
         ),
         option(
             "remove-untracked",
             None,
-            (
-                "Removes packages not present in the lock file."
-                " (<warning>Deprecated</warning>)"
-            ),
+            "Removes packages not present in the lock file."
+            " (<warning>Deprecated</warning>)",
         ),
         option(
             "extras",
@@ -68,11 +58,9 @@ class InstallCommand(InstallerCommand):
         option(
             "compile",
             None,
-            (
-                "Compile Python source files to bytecode."
-                " (This option has no effect if modern-installation is disabled"
-                " because the old installer always compiles.)"
-            ),
+            "Compile Python source files to bytecode."
+            " (This option has no effect if modern-installation is disabled"
+            " because the old installer always compiles.)",
         ),
     ]
 

diff --git a/src/poetry/console/commands/lock.py b/src/poetry/console/commands/lock.py
@@ -16,11 +16,9 @@ class LockCommand(InstallerCommand):
         option(
             "check",
             None,
-            (
-                "Check that the <comment>poetry.lock</> file corresponds to the current"
-                " version of <comment>pyproject.toml</>. (<warning>Deprecated</>) Use"
-                " <comment>poetry check --lock</> instead."
-            ),
+            "Check that the <comment>poetry.lock</> file corresponds to the current"
+            " version of <comment>pyproject.toml</>. (<warning>Deprecated</>) Use"
+            " <comment>poetry check --lock</> instead.",
         ),
     ]
 

diff --git a/src/poetry/console/commands/remove.py b/src/poetry/console/commands/remove.py
@@ -21,19 +21,15 @@ class RemoveCommand(InstallerCommand):
         option(
             "dev",
             "D",
-            (
-                "Remove a package from the development dependencies."
-                " (<warning>Deprecated</warning>)"
-                " Use --group=dev instead."
-            ),
+            "Remove a package from the development dependencies."
+            " (<warning>Deprecated</warning>)"
+            " Use --group=dev instead.",
         ),
         option(
             "dry-run",
             None,
-            (
-                "Output the operations but do not execute anything "
-                "(implicitly enables --verbose)."
-            ),
+            "Output the operations but do not execute anything "
+            "(implicitly enables --verbose).",
         ),
         option("lock", None, "Do not perform operations (only update the lockfile)."),
     ]

diff --git a/src/poetry/console/commands/self/update.py b/src/poetry/console/commands/self/update.py
@@ -23,10 +23,8 @@ class SelfUpdateCommand(SelfCommand):
         option(
             "dry-run",
             None,
-            (
-                "Output the operations but do not execute anything "
-                "(implicitly enables --verbose)."
-            ),
+            "Output the operations but do not execute anything "
+            "(implicitly enables --verbose).",
         ),
     ]
     help = """\

diff --git a/src/poetry/console/commands/show.py b/src/poetry/console/commands/show.py
@@ -48,10 +48,8 @@ class ShowCommand(GroupCommand, EnvCommand):
         option(
             "why",
             None,
-            (
-                "When showing the full list, or a <info>--tree</info> for a single"
-                " package, also display why it's included."
-            ),
+            "When showing the full list, or a <info>--tree</info> for a single"
+            " package, also display why it's included.",
         ),
         option("latest", "l", "Show the latest version."),
         option(

diff --git a/src/poetry/console/commands/source/add.py b/src/poetry/console/commands/source/add.py
@@ -21,10 +21,8 @@ class SourceAddCommand(Command):
         ),
         argument(
             "url",
-            (
-                "Source repository URL."
-                " Required, except for PyPI, for which it is not allowed."
-            ),
+            "Source repository URL."
+            " Required, except for PyPI, for which it is not allowed.",
             optional=True,
         ),
     ]
@@ -33,28 +31,22 @@ class SourceAddCommand(Command):
         option(
             "default",
             "d",
-            (
-                "Set this source as the default (disable PyPI). A "
-                "default source will also be the fallback source if "
-                "you add other sources. (<warning>Deprecated</warning>, use --priority)"
-            ),
+            "Set this source as the default (disable PyPI). A "
+            "default source will also be the fallback source if "
+            "you add other sources. (<warning>Deprecated</warning>, use --priority)",
         ),
         option(
             "secondary",
             "s",
-            (
-                "Set this source as secondary. (<warning>Deprecated</warning>, use"
-                " --priority)"
-            ),
+            "Set this source as secondary. (<warning>Deprecated</warning>, use"
+            " --priority)",
         ),
         option(
             "priority",
             "p",
-            (
-                "Set the priority of this source. One of:"
-                f" {', '.join(p.name.lower() for p in Priority)}. Defaults to"
-                f" {Priority.PRIMARY.name.lower()}."
-            ),
+            "Set the priority of this source. One of:"
+            f" {', '.join(p.name.lower() for p in Priority)}. Defaults to"
+            f" {Priority.PRIMARY.name.lower()}.",
             flag=False,
         ),
     ]

diff --git a/src/poetry/console/commands/update.py b/src/poetry/console/commands/update.py
@@ -20,18 +20,14 @@ class UpdateCommand(InstallerCommand):
         option(
             "no-dev",
             None,
-            (
-                "Do not update the development dependencies."
-                " (<warning>Deprecated</warning>)"
-            ),
+            "Do not update the development dependencies."
+            " (<warning>Deprecated</warning>)",
         ),
         option(
             "dry-run",
             None,
-            (
-                "Output the operations but do not execute anything "
-                "(implicitly enables --verbose)."
-            ),
+            "Output the operations but do not execute anything "
+            "(implicitly enables --verbose).",
         ),
         option("lock", None, "Do not perform operations (only update the lockfile)."),
     ]

diff --git a/src/poetry/installation/chooser.py b/src/poetry/installation/chooser.py
@@ -48,21 +48,17 @@ def choose_for(self, package: Package) -> Link:
             if link.is_wheel:
                 if not self._no_binary_policy.allows(package.name):
                     logger.debug(
-                        (
-                            "Skipping wheel for %s as requested in no binary policy for"
-                            " package (%s)"
-                        ),
+                        "Skipping wheel for %s as requested in no binary policy for"
+                        " package (%s)",
                         link.filename,
                         package.name,
                     )
                     continue
 
                 if not Wheel(link.filename).is_supported_by_environment(self._env):
                     logger.debug(
-                        (
-                            "Skipping wheel %s as this is not supported by the current"
-                            " environment"
-                        ),
+                        "Skipping wheel %s as this is not supported by the current"
+                        " environment",
                         link.filename,
                     )
                     continue