From 816e6ec993dac198134d736954368319f9db1c3e Mon Sep 17 00:00:00 2001
From: Stefan Reck <stefan.reck@fau.de>
Date: Tue, 6 Jul 2021 11:59:39 +0200
Subject: [PATCH] remove deprecated parser implementations
---
orcasong/plotting/plot_binstats.py | 16 ++--------------
orcasong/tools/concatenate.py | 29 ++---------------------------
orcasong/tools/make_data_split.py | 14 ++------------
orcasong/tools/postproc.py | 11 ++---------
orcasong/tools/shuffle2.py | 6 ++++++
5 files changed, 14 insertions(+), 62 deletions(-)
diff --git a/orcasong/plotting/plot_binstats.py b/orcasong/plotting/plot_binstats.py
index e27fb7e..bea90eb 100644
--- a/orcasong/plotting/plot_binstats.py
+++ b/orcasong/plotting/plot_binstats.py
@@ -219,20 +219,8 @@ def get_all_h5_files():
def main():
# TODO deprecated
- warnings.warn(
- "plot_binstats is deprecated and has been renamed to orcasong plot_binstats")
- parser = argparse.ArgumentParser(
- description='Generate a plot with statistics of the binning. '
- 'Can only be used on files generated with the FileBinner when '
- 'add_bin_stats was set to true (default). ')
- parser.add_argument(
- '--save_as', type=str, default="bin_stats_plot.pdf",
- help='Filename of the plot. Default: bin_stats_plot.pdf.')
- parser.add_argument(
- 'files', type=str, nargs='*', default=None,
- help='File(s) to plot. Default: Plot for all h5 files in current dir.')
-
- plot_hist_of_files(**vars(parser.parse_args()))
+ raise NotImplementedError(
+ "plot_binstats has been renamed to orcasong plot_binstats")
def add_parser(subparsers):
diff --git a/orcasong/tools/concatenate.py b/orcasong/tools/concatenate.py
index 51c3a8d..0c47fb7 100644
--- a/orcasong/tools/concatenate.py
+++ b/orcasong/tools/concatenate.py
@@ -325,33 +325,8 @@ def concatenate(file, outfile="concatenated.h5", no_used_files=False, skip_error
def main():
# TODO deprecated
- warnings.warn("concatenate is deprecated and has been renamed to orcasong concatenate")
- parser = argparse.ArgumentParser(
- description='Concatenate many small h5 files to a single large one '
- 'in a km3pipe compatible format. This is intended for '
- 'files that get generated by orcasong, i.e. all datsets '
- 'should have the same length, with one row per '
- 'blob. '
- 'Compression options and the datasets to be created in '
- 'the new file will be read from the first input file.')
- parser.add_argument(
- 'file', type=str, nargs="*",
- help="Define the files to concatenate. If it's one argument: A txt list "
- "with pathes of h5 files to concatenate (one path per line). "
- "If it's multiple arguments: "
- "The pathes of h5 files to concatenate.")
- parser.add_argument(
- '--outfile', type=str, default="concatenated.h5",
- help='The absoulte filepath of the output .h5 file that will be created. ')
- parser.add_argument(
- '--no_used_files', action='store_true',
- help="Per default, the paths of the input files are added "
- "as their own datagroup in the output file. Use this flag to "
- "disable. ")
- parser.add_argument(
- '--skip_errors', action='store_true',
- help="If true, ignore files that can't be concatenated. ")
- concatenate(**vars(parser.parse_args()))
+ raise NotImplementedError(
+ "concatenate has been renamed to orcasong concatenate")
if __name__ == '__main__':
diff --git a/orcasong/tools/make_data_split.py b/orcasong/tools/make_data_split.py
index d5f3dc7..e1126b4 100644
--- a/orcasong/tools/make_data_split.py
+++ b/orcasong/tools/make_data_split.py
@@ -15,18 +15,8 @@ import numpy as np
def get_parser():
# TODO deprecated
- warnings.warn("make_data_split is deprecated and has been renamed to orcasong make_data_split")
- parser = argparse.ArgumentParser(
- description="Create datasets based on the run_id's."
- "Use the config to add input folder and set the ranges."
- "Outputs a list in an txt file that can be used to "
- "concatenate the files specfied"
- )
- parser.add_argument(
- "config", type=str, help="See example config for detailed information"
- )
-
- return parser
+ raise NotImplementedError(
+ "make_data_split has been renamed to orcasong make_data_split")
def add_parser(subparsers):
diff --git a/orcasong/tools/postproc.py b/orcasong/tools/postproc.py
index 45cc320..4119482 100644
--- a/orcasong/tools/postproc.py
+++ b/orcasong/tools/postproc.py
@@ -118,12 +118,5 @@ def get_filepath_output(input_file, shuffle=True, event_skipper=None):
def h5shuffle():
# TODO deprecated
- warnings.warn("h5shuffle is deprecated and has been renamed to orcasong h5shuffle")
- parser = argparse.ArgumentParser(description='Shuffle an h5 file using km3pipe.')
- parser.add_argument('input_file', type=str, help='File to shuffle.')
- parser.add_argument('--output_file', type=str,
- help='Name of output file. Default: Auto generate name.')
- parser.add_argument('--delete', action="store_true",
- help='Delete original file afterwards.')
-
- postproc_file(**vars(parser.parse_args()), shuffle=True, event_skipper=None)
+ raise NotImplementedError(
+ "h5shuffle has been renamed to orcasong h5shuffle")
diff --git a/orcasong/tools/shuffle2.py b/orcasong/tools/shuffle2.py
index 639d62a..28f8a88 100644
--- a/orcasong/tools/shuffle2.py
+++ b/orcasong/tools/shuffle2.py
@@ -273,3 +273,9 @@ def _slicify(fancy_indices):
def _get_temp_filenames(output_file, number):
path, file = os.path.split(output_file)
return [os.path.join(path, f"temp_iteration_{i}_{file}") for i in range(number)]
+
+
+def run_parser():
+ # TODO deprecated
+ raise NotImplementedError(
+ "h5shuffle2 has been renamed to orcasong h5shuffle2")
--
GitLab