Reintroduce the --wheel CLI option, even though it has no effect on Python >= 3.8

Author: hroncok

src/virtualenv/seed/embed/base_embed.py

@@ -20,21 +20,23 @@ def __init__(self, options) -> None:
 
         self.pip_version = options.pip
         self.setuptools_version = options.setuptools
-        if hasattr(options, "wheel"):
-            # Python 3.8
-            self.wheel_version = options.wheel
-            self.no_wheel = options.no_wheel
-        elif options.no_wheel:
+        self.wheel_version = options.wheel
+
+        self.no_pip = options.no_pip
+        self.no_setuptools = options.no_setuptools
+        self.no_wheel = options.no_wheel
+
+        if options.no_wheel or options.wheel:  # and interpreter.version_info[:2] >= (3, 9)
             warn(
-                "The --no-wheel option is deprecated. "
-                "It has no effect for Python >= 3.8 as wheel is no longer "
+                "The --no-wheel and -wheel options are deprecated. "
+                "They have no effect for Python >= 3.8 as wheel is no longer "
                 "bundled in virtualenv.",
                 DeprecationWarning,
                 stacklevel=1,
             )
+            self.wheel_version = "none"
+            self.no_wheel = True
 
-        self.no_pip = options.no_pip
-        self.no_setuptools = options.no_setuptools
         self.app_data = options.app_data
         self.periodic_update = not options.no_periodic_update
 
@@ -83,15 +85,17 @@ def add_parser_arguments(cls, parser, interpreter, app_data):  # noqa: ARG003
             default=[],
         )
         for distribution, default in cls.distributions().items():
-            if interpreter.version_info[:2] >= (3, 12) and distribution == "setuptools":
+            help_ = f"version of {distribution} to install as seed: embed, bundle, none or exact version"
+            if interpreter.version_info[:2] >= (3, 12) and distribution in {"wheel", "setuptools"}:
                 default = "none"  # noqa: PLW2901
             if interpreter.version_info[:2] >= (3, 9) and distribution == "wheel":
-                continue
+                default = None  # noqa: PLW2901
+                help_ = SUPPRESS
             parser.add_argument(
                 f"--{distribution}",
                 dest=distribution,
                 metavar="version",
-                help=f"version of {distribution} to install as seed: embed, bundle, none or exact version",
+                help=help_,
                 default=default,
             )
         for distribution in cls.distributions():