Apply suggestions from code review

Co-authored-by: Ed Morley <[email protected]>

Author: abravalheri

setuptools/_normalization.py

@@ -81,7 +81,7 @@ def best_effort_version(version: str) -> str:
             f"""
             Version {version!r} is not valid according to PEP 440.
 
-            Please make sure specify a valid version for your package.
+            Please make sure to specify a valid version for your package.
             Also note that future releases of setuptools may halt the build process
             if an invalid version is given.
             """,

setuptools/build_meta.py

@@ -304,7 +304,7 @@ def _arbitrary_args(self, config_settings: _ConfigSettings) -> Iterator[str]:
                 f"""
                 The arguments {bad_args!r} were given via `--global-option`.
                 Please use `--build-option` instead,
-                `--global-option` is reserved to flags like `--verbose` or `--quiet`.
+                `--global-option` is reserved for flags like `--verbose` or `--quiet`.
                 """,
                 due_date=(2023, 9, 26),  # Warning introduced in v64.0.1, 11/Aug/2022.
             )

setuptools/command/build.py

@@ -23,7 +23,7 @@ def get_sub_commands(self):
         subcommands = {cmd[0] for cmd in _build.sub_commands}
         if subcommands - _ORIGINAL_SUBCOMMANDS:
             SetuptoolsDeprecationWarning.emit(
-                "Directly usage of `distutils` commands",
+                "Direct usage of `distutils` commands",
                 """
                 It seems that you are using `distutils.command.build` to add
                 new subcommands. Using `distutils` directly is considered deprecated,

setuptools/command/build_py.py

@@ -336,9 +336,9 @@ class _Warning(SetuptoolsDeprecationWarning):
         Python recognizes {importable!r} as an importable package[^1],
         but it is absent from setuptools' `packages` configuration.
 
-        This leads to an ambiguous overall configuration. If you want distribute this
+        This leads to an ambiguous overall configuration. If you want to distribute this
         package, please make sure that {importable!r} is explicitly added
-        the `packages` configuration field.
+        to the `packages` configuration field.
 
         Alternatively, you can also rely on setuptools' discovery methods
         (for example by using `find_namespace_packages(...)`/`find_namespace:`

setuptools/command/editable_wheel.py

@@ -305,7 +305,7 @@ def _safely_run(self, cmd_name: str):
                 If you are seeing this warning it is very likely that a setuptools
                 plugin or customization overrides the `{cmd_name}` command, without
                 taking into consideration how editable installs run build steps
-                starting from v64.0.0.
+                starting from setuptools v64.0.0.
 
                 Plugin authors and developers relying on custom build steps are
                 encouraged to update their `{cmd_name}` implementation considering the
@@ -836,18 +836,18 @@ class _DebuggingTips(SetuptoolsWarning):
     _DETAILS = """
     An error happened while installing `{project}` in editable mode.
 
-    The following steps are recommended to help debugging this problem:
+    The following steps are recommended to help debug this problem:
 
     - Try to install the project normally, without using the editable mode.
-      Does the error still persists?
+      Does the error still persist?
       (If it does, try fixing the problem before attempting the editable mode).
     - If you are using binary extensions, make sure you have all OS-level
       dependencies installed (e.g. compilers, toolchains, binary libraries, ...).
     - Try the latest version of setuptools (maybe the error was already fixed).
     - If you (or your project dependencies) are using any setuptools extension
       or customization, make sure they support the editable mode.
 
-    After following the steps above, if the problem still persist and
+    After following the steps above, if the problem still persists and
     you think this is related to how setuptools handles editable installations,
     please submit a reproducible example
     (see https://stackoverflow.com/help/minimal-reproducible-example) to:

setuptools/dist.py

@@ -825,7 +825,7 @@ def make_option_lowercase(self, opt, section):
             "Invalid uppercase configuration",
             f"""
             Usage of uppercase key {opt!r} in {section!r} will not be supported in
-            future versions. Please use lowercase {lowercase_opt!r} instead
+            future versions. Please use lowercase {lowercase_opt!r} instead.
             """,
             see_docs="userguide/declarative_config.html",
             due_date=(2023, 9, 26),