Skip to content

Commit e5da48f

Browse files
Remove --future-format flag
See #2653 (comment) Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent a93fd62 commit e5da48f

3 files changed

Lines changed: 0 additions & 16 deletions

File tree

src/scancode/cli.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ def print_version(ctx, param, value):
9595
return
9696
click.echo('ScanCode version ' + scancode_config.__version__)
9797
click.echo('Output Format version ' + scancode_config.__output_format_version__)
98-
click.echo('Future Output Format version ' + scancode_config.__future_output_format_version__)
9998
ctx.exit()
10099

101100

@@ -251,13 +250,6 @@ def validate_depth(ctx, param, value):
251250
'the starting directory. Use 0 for no scan depth limit.',
252251
help_group=cliutils.CORE_GROUP, sort_order=301, cls=PluggableCommandLineOption)
253252

254-
@click.option('--future-format',
255-
is_flag=True,
256-
help='Output the future data format, for JSON and YAML output. '
257-
'See CHANGELOG for more details on the changes in this future data format.',
258-
help_group=cliutils.OUTPUT_CONTROL_GROUP, cls=PluggableCommandLineOption)
259-
260-
261253
@click.help_option('-h', '--help',
262254
help_group=cliutils.DOC_GROUP, sort_order=10, cls=PluggableCommandLineOption)
263255

@@ -354,7 +346,6 @@ def scancode(
354346
verbose,
355347
max_depth,
356348
from_json,
357-
future_format,
358349
timing,
359350
max_in_memory,
360351
test_mode,
@@ -458,7 +449,6 @@ def scancode(
458449
quiet=quiet,
459450
verbose=verbose,
460451
max_depth=max_depth,
461-
future_format=future_format,
462452
timing=timing,
463453
max_in_memory=max_in_memory,
464454
test_mode=test_mode,
@@ -495,7 +485,6 @@ def scancode(
495485
def run_scan(
496486
input, # NOQA
497487
from_json=False,
498-
future_format=False,
499488
strip_root=False,
500489
full_root=False,
501490
max_in_memory=10000,
@@ -602,7 +591,6 @@ def echo_func(*_args, **_kwargs):
602591
quiet=quiet,
603592
verbose=verbose,
604593
from_json=from_json,
605-
future_format=future_format,
606594
timing=timing,
607595
max_in_memory=max_in_memory,
608596
test_mode=test_mode,

src/scancode_config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ def _create_dir(location):
7979
# See https://github.com/nexB/scancode-toolkit/issues/2653 for more information
8080
# on the data format version
8181
__output_format_version__ = '1.0.0'
82-
__future_output_format_version__ = '1.0.0'
8382

8483

8584
try:

tests/scancode/data/help/help.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ Options:
7171

7272
output control:
7373
--full-root Report full, absolute paths.
74-
--future-format Output the future data format, for JSON and YAML
75-
output. See CHANGELOG for more details on the changes in this
76-
future data format.
7774
--strip-root Strip the root directory segment of all paths. The default is
7875
to always include the last directory segment of the scanned
7976
path such that all paths have a common root directory.

0 commit comments

Comments
 (0)