Skip to content

Commit

Permalink
Remove --future-format flag
Browse files Browse the repository at this point in the history
See #2653 (comment)

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
  • Loading branch information
AyanSinhaMahapatra committed Sep 6, 2021
1 parent a93fd62 commit e5da48f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 16 deletions.
12 changes: 0 additions & 12 deletions src/scancode/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ def print_version(ctx, param, value):
return
click.echo('ScanCode version ' + scancode_config.__version__)
click.echo('Output Format version ' + scancode_config.__output_format_version__)
click.echo('Future Output Format version ' + scancode_config.__future_output_format_version__)
ctx.exit()


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

@click.option('--future-format',
is_flag=True,
help='Output the future data format, for JSON and YAML output. '
'See CHANGELOG for more details on the changes in this future data format.',
help_group=cliutils.OUTPUT_CONTROL_GROUP, cls=PluggableCommandLineOption)


@click.help_option('-h', '--help',
help_group=cliutils.DOC_GROUP, sort_order=10, cls=PluggableCommandLineOption)

Expand Down Expand Up @@ -354,7 +346,6 @@ def scancode(
verbose,
max_depth,
from_json,
future_format,
timing,
max_in_memory,
test_mode,
Expand Down Expand Up @@ -458,7 +449,6 @@ def scancode(
quiet=quiet,
verbose=verbose,
max_depth=max_depth,
future_format=future_format,
timing=timing,
max_in_memory=max_in_memory,
test_mode=test_mode,
Expand Down Expand Up @@ -495,7 +485,6 @@ def scancode(
def run_scan(
input, # NOQA
from_json=False,
future_format=False,
strip_root=False,
full_root=False,
max_in_memory=10000,
Expand Down Expand Up @@ -602,7 +591,6 @@ def echo_func(*_args, **_kwargs):
quiet=quiet,
verbose=verbose,
from_json=from_json,
future_format=future_format,
timing=timing,
max_in_memory=max_in_memory,
test_mode=test_mode,
Expand Down
1 change: 0 additions & 1 deletion src/scancode_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ def _create_dir(location):
# See https://github.com/nexB/scancode-toolkit/issues/2653 for more information
# on the data format version
__output_format_version__ = '1.0.0'
__future_output_format_version__ = '1.0.0'


try:
Expand Down
3 changes: 0 additions & 3 deletions tests/scancode/data/help/help.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ Options:

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

0 comments on commit e5da48f

Please sign in to comment.