chore(cli): align check_eip_versions with other pytest clis

Author: danceratopz

src/cli/pytest_commands/check_eip_versions.py

@@ -1,25 +1,19 @@
 """CLI entry point for the EIP version checker pytest-based command."""
 
 import sys
+from typing import List
 
 import click
 import pytest
 
+from .common import common_click_options, handle_help_flags
 
-@click.command(
-    context_settings={
-        "help_option_names": ["-h", "--help"],
-    }
-)
-@click.option(
-    "--github-token",
-    help="GitHub API token required to avoid rate limiting when checking EIP versions",
-    envvar="GITHUB_TOKEN",
-    required=True,
-)
-def check_eip_versions(github_token: str) -> None:
-    """Run pytest with the `spec_version_checker` plugin."""
-    args = ["-c", "pytest-check-eip-versions.ini", "--github-token", github_token]
 
+@click.command(context_settings={"ignore_unknown_options": True})
+@common_click_options
+def check_eip_versions(pytest_args: List[str], **kwargs) -> None:
+    """Run pytest with the `spec_version_checker` plugin."""
+    args = ["-c", "pytest-check-eip-versions.ini"]
+    args += handle_help_flags(list(pytest_args), pytest_type="check-eip-versions")
     result = pytest.main(args)
     sys.exit(result)

src/cli/pytest_commands/common.py

@@ -37,6 +37,7 @@ def common_click_options(func: Callable[..., Any]) -> Decorator:
 
 
 REQUIRED_FLAGS: Dict[str, List] = {
+    "check-eip-versions": [],
     "fill": [],
     "consume": [],
     "execute": [
@@ -74,7 +75,15 @@ def handle_help_flags(pytest_args: List[str], pytest_type: str) -> List[str]:
     if ctx.params.get("help_flag"):
         return (
             [f"--{pytest_type}-help", *REQUIRED_FLAGS[pytest_type]]
-            if pytest_type in {"consume", "fill", "execute", "execute-hive", "execute-recover"}
+            if pytest_type
+            in {
+                "check-eip-versions",
+                "consume",
+                "fill",
+                "execute",
+                "execute-hive",
+                "execute-recover",
+            }
             else pytest_args
         )
     elif ctx.params.get("pytest_help_flag"):

src/pytest_plugins/help/help.py

@@ -12,6 +12,13 @@
 def pytest_addoption(parser):
     """Add command-line options to pytest for specific help commands."""
     help_group = parser.getgroup("help_options", "Help options for different commands")
+    help_group.addoption(
+        "--check-eip-versions-help",
+        action="store_true",
+        dest="show_check_eip_versions_help",
+        default=False,
+        help="Show help options only for the check_eip_versions command and exit.",
+    )
     help_group.addoption(
         "--fill-help",
         action="store_true",
@@ -52,7 +59,16 @@ def pytest_addoption(parser):
 @pytest.hookimpl(tryfirst=True)
 def pytest_configure(config):
     """Handle specific help flags by displaying the corresponding help message."""
-    if config.getoption("show_fill_help"):
+    if config.getoption("show_check_eip_versions_help"):
+        show_specific_help(
+            config,
+            "pytest-check-eip-versions.ini",
+            [
+                "spec_version_checker",
+                "EIP spec version",
+            ],
+        )
+    elif config.getoption("show_fill_help"):
         show_specific_help(
             config,
             "pytest.ini",

src/pytest_plugins/spec_version_checker/spec_version_checker.py

@@ -16,14 +16,16 @@
 
 
 def pytest_addoption(parser):
-    """Add GitHub token option to pytest command line options."""
-    group = parser.getgroup("github")
+    """Add Github token option to pytest command line options."""
+    group = parser.getgroup(
+        "spec_version_checker", "Arguments defining the EIP spec version checker"
+    )
     group.addoption(
         "--github-token",
         action="store",
         dest="github_token",
         default=None,
-        help="GitHub API token to avoid rate limiting",
+        help="A Github API personal access token to avoid rate limiting",
     )
 
 
@@ -44,9 +46,10 @@ def pytest_configure(config):
 
     if not github_token:
         pytest.exit(
-            "A GitHub personal access token is required but has not been provided. "
-            "Either set the GITHUB_TOKEN environment variable or use --github-token option. "
-            "Generate a token at https://github.com/settings/personal-access-tokens/new"
+            "A Github personal access token is required but has not been provided. "
+            "Either set the GITHUB_TOKEN environment variable or specify one via --github-token. "
+            "Generate a token for your Github account at "
+            "https://github.com/settings/personal-access-tokens/new"
         )
 
     config.github_token = github_token