ldragon/pyproject-rpm-macros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder %pyproject_buildrequires arguments for a nicer usage string

Browse Source 
Before:

    usage: %pyproject_buildrequires [-w] [-R] [-e TOXENVS] [-t] [-x EXTRAS] [-N] [REQUIREMENTS.TXT ...]

After:

    usage: %pyproject_buildrequires [-x EXTRAS] [-t] [-e TOXENVS] [-w] [-R] [-N] [REQUIREMENTS.TXT ...]

The order was determined as:

    0. suppressed options
    1. extras, the easiest way to specify test deps (x)
    2. tox related options (te)
    3. build wheel, as it is provisional (w)
    4. "disablers" (RN)
    5. varargs are always listed last

Previous order was pretty much random.
This commit is contained in:
Miro Hrončok 2022-10-10 12:59:26 +02:00
parent 222ec5f4f5
commit 8b3af75e2f
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pyproject_buildrequires.py
View File

@ -438,40 +438,40 @@ def main(argv):
help=argparse.SUPPRESS, # Generate run-time requirements (backwards-compatibility only) help=argparse.SUPPRESS, # Generate run-time requirements (backwards-compatibility only)
) )
parser.add_argument( parser.add_argument(
'-w', '--wheel', action='store_true', default=False, '--generate-extras', action='store_true',
help=('Generate run-time requirements by building the wheel ' help=argparse.SUPPRESS,
'(useful for build backends without the prepare_metadata_for_build_wheel hook)'), )
parser.add_argument(
'-p', '--python3_pkgversion', metavar='PYTHON3_PKGVERSION',
default="3", help=argparse.SUPPRESS,
) )
parser.add_argument( parser.add_argument(
'--wheeldir', metavar='PATH', default=None, '--wheeldir', metavar='PATH', default=None,
help=argparse.SUPPRESS, help=argparse.SUPPRESS,
) )
parser.add_argument(
'-R', '--no-runtime', action='store_false', dest='runtime',
help="Don't generate run-time requirements (implied by -N)",
)
parser.add_argument(
'-e', '--toxenv', metavar='TOXENVS', action='append',
help=('specify tox environments (comma separated and/or repeated)'
'(implies --tox)'),
)
parser.add_argument(
'-t', '--tox', action='store_true',
help=('generate test tequirements from tox environment '
'(implies --runtime)'),
)
parser.add_argument( parser.add_argument(
'-x', '--extras', metavar='EXTRAS', action='append', '-x', '--extras', metavar='EXTRAS', action='append',
help='comma separated list of "extras" for runtime requirements ' help='comma separated list of "extras" for runtime requirements '
'(e.g. -x testing,feature-x) (implies --runtime, can be repeated)', '(e.g. -x testing,feature-x) (implies --runtime, can be repeated)',
) )
parser.add_argument( parser.add_argument(
'--generate-extras', action='store_true', '-t', '--tox', action='store_true',
help=argparse.SUPPRESS, help=('generate test tequirements from tox environment '
'(implies --runtime)'),
) )
parser.add_argument( parser.add_argument(
'-p', '--python3_pkgversion', metavar='PYTHON3_PKGVERSION', '-e', '--toxenv', metavar='TOXENVS', action='append',
default="3", help=argparse.SUPPRESS, help=('specify tox environments (comma separated and/or repeated)'
'(implies --tox)'),
)
parser.add_argument(
'-w', '--wheel', action='store_true', default=False,
help=('Generate run-time requirements by building the wheel '
'(useful for build backends without the prepare_metadata_for_build_wheel hook)'),
)
parser.add_argument(
'-R', '--no-runtime', action='store_false', dest='runtime',
help="Don't generate run-time requirements (implied by -N)",
) )
parser.add_argument( parser.add_argument(
'-N', '--no-use-build-system', dest='use_build_system', '-N', '--no-use-build-system', dest='use_build_system',