committing one last time before running checks again

Author: debugduck

AUTHORS

@@ -63,6 +63,7 @@ Christian Tismer
 Christoph Buelter
 Christopher Dignam
 Christopher Gilling
+Claire Cecil
 Claudio Madotto
 CrazyMerlyn
 Cyrus Maden

changelog/7128.improvement.rst

@@ -0,0 +1 @@
+`pytest --version` now displays just the pytest version, while `pytest --version --version` displays more verbose information including plugins.

src/_pytest/helpconfig.py

@@ -43,6 +43,7 @@ def pytest_addoption(parser):
         "-V",
         action="count",
         default=0,
+        dest="version",
         help="display pytest version and information about plugins."
         "When given twice, also display information about plugins.",
     )

testing/test_config.py

@@ -1244,6 +1244,52 @@ def pytest_addoption(parser):
     assert result.ret == ExitCode.USAGE_ERROR
 
 
+def test_help_and_version_verbose_after_argument_error(testdir):
+    testdir.makeconftest(
+        """
+        def validate(arg):
+            raise argparse.ArgumentTypeError("argerror")
+
+        def pytest_addoption(parser):
+            group = parser.getgroup('cov')
+            group.addoption(
+                "--invalid-option-should-allow-for-help",
+                type=validate,
+            )
+        """
+    )
+    testdir.makeini(
+        """
+        [pytest]
+        addopts = --invalid-option-should-allow-for-help
+    """
+    )
+    result = testdir.runpytest("--help")
+    result.stdout.fnmatch_lines(
+        [
+            "usage: *",
+            "positional arguments:",
+            "NOTE: displaying only minimal help due to UsageError.",
+        ]
+    )
+    result.stderr.fnmatch_lines(
+        [
+            "ERROR: usage: *",
+            "%s: error: argument --invalid-option-should-allow-for-help: expected one argument"
+            % (testdir.request.config._parser.optparser.prog,),
+        ]
+    )
+    # Does not display full/default help.
+    assert "to see available markers type: pytest --markers" not in result.stdout.lines
+    assert result.ret == ExitCode.USAGE_ERROR
+
+    result = testdir.runpytest("--version", "--version")
+    result.stderr.fnmatch_lines(
+        ["*pytest*{}*imported from*".format(pytest.__version__)]
+    )
+    assert result.ret == ExitCode.USAGE_ERROR
+
+
 def test_help_formatter_uses_py_get_terminal_width(monkeypatch):
     from _pytest.config.argparsing import DropShorterLongHelpFormatter