From 457f782d03c2aea00733083fff64436d6060df11 Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Date: Mon, 6 Sep 2021 23:06:09 +0530
Subject: [PATCH] Remove --future-format flag

See https://github.com/nexB/scancode-toolkit/issues/2653#issuecomment-913708258

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
---
 src/scancode/cli.py               | 12 ------------
 src/scancode_config.py            |  1 -
 tests/scancode/data/help/help.txt |  3 ---
 3 files changed, 16 deletions(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 9b4c30674e6..988b46f245a 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -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()
 
 
@@ -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)
 
@@ -354,7 +346,6 @@ def scancode(
     verbose,
     max_depth,
     from_json,
-    future_format,
     timing,
     max_in_memory,
     test_mode,
@@ -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,
@@ -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,
@@ -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,
diff --git a/src/scancode_config.py b/src/scancode_config.py
index 9500fffc792..9b39612c7cb 100644
--- a/src/scancode_config.py
+++ b/src/scancode_config.py
@@ -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:
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index a5e24d6c205..5d031946d3c 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -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.