wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

README.md

@@ -43,7 +43,7 @@ Read the full [documentation][link_rtfd] for more details.
 
 ## Requirements
 
-* Python `>=3.8,<4`
+* Python `>=3.9,<4`
 
 However, there are older versions of this tool available, which
 support Python `>=2.7`.

cyclonedx_py/_internal/cli.py

@@ -17,7 +17,7 @@
 
 import logging
 import sys
-from argparse import ArgumentParser, FileType, RawDescriptionHelpFormatter
+from argparse import ArgumentParser, BooleanOptionalAction, FileType, RawDescriptionHelpFormatter
 from itertools import chain
 from typing import TYPE_CHECKING, Any, Dict, List, NoReturn, Optional, Sequence, TextIO, Type, Union
 
@@ -35,20 +35,11 @@
 from .utils.args import argparse_type4enum, choices4enum
 
 if TYPE_CHECKING:  # pragma: no cover
-    from argparse import Action
-
     from cyclonedx.model.bom import Bom
     from cyclonedx.model.component import Component
 
     from . import BomBuilder
 
-    BooleanOptionalAction: Optional[Type[Action]]
-
-if sys.version_info >= (3, 9):
-    from argparse import BooleanOptionalAction
-else:
-    BooleanOptionalAction = None
-
 OPTION_OUTPUT_STDOUT = '-'
 
 
@@ -121,25 +112,12 @@ def make_argument_parser(cls, sco: ArgumentParser, **kwargs: Any) -> ArgumentPar
                         type=FileType('wt', encoding='utf8'),
                         dest='output_file',
                         default=OPTION_OUTPUT_STDOUT)
-        if BooleanOptionalAction:
-            op.add_argument('--validate',
-                            help='Whether to validate resulting BOM before outputting.'
-                                 ' (default: %(default)s)',
-                            action=BooleanOptionalAction,
-                            dest='should_validate',
-                            default=True)
-        else:
-            vg = op.add_mutually_exclusive_group()
-            vg.add_argument('--validate',
-                            help='Validate resulting BOM before outputting.'
-                                 ' (default: %(default)s)',
-                            action='store_true',
-                            dest='should_validate',
-                            default=True)
-            vg.add_argument('--no-validate',
-                            help='Disable validation of resulting BOM.',
-                            dest='should_validate',
-                            action='store_false')
+        op.add_argument('--validate',
+                        help='Whether to validate resulting BOM before outputting.'
+                             ' (default: %(default)s)',
+                        action=BooleanOptionalAction,
+                        dest='should_validate',
+                        default=True)
 
         scbbc: Type['BomBuilder']
         sct: str

pyproject.toml

@@ -67,7 +67,7 @@ classifiers = [
 cyclonedx-py = "cyclonedx_py._internal.cli:run"
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 cyclonedx-python-lib = { version = "^8.0 || ^9.0 || ^10", extras = ["validation"] }
 packageurl-python = ">=0.11, <2"  # keep in sync with same dep in `cyclonedx-python-lib`
 pip-requirements-parser = "^32.0"

tox.ini

@@ -8,7 +8,7 @@ minversion = 4.0
 envlist =
     flake8
     mypy-{current,lowest}
-    py{313,312,311,310,39,38}
+    py{313,312,311,310,39}
     bandit
 skip_missing_interpreters = True
 usedevelop = False
@@ -35,7 +35,7 @@ skip_install = True
 commands =
     # mypy config is on own file: `.mypy.ini`
     !lowest: poetry run mypy
-     lowest: poetry run mypy --python-version=3.8
+     lowest: poetry run mypy --python-version=3.9
 
 [testenv:flake8]
 skip_install = True