Skip to content

Commit

Permalink
fixed deprecation message
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorb1 committed Feb 23, 2023
1 parent 0073c91 commit f0bb9a3
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions src/otoole/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def validate_model(args):
"Reading from datapackage is deprecated, trying to read from CSVs"
)
data_file = read_deprecated_datapackage(data_file)
logger.info("Successfully read folder of CSVs")
read_strategy = ReadCsv(user_config=config)
elif data_format == "csv":
read_strategy = ReadCsv(user_config=config)
Expand Down Expand Up @@ -152,6 +153,7 @@ def result_matrix(args):
"Reading from datapackage is deprecated, trying to read from CSVs"
)
input_csvs = read_deprecated_datapackage(args.input_datapackage)
logger.info("Successfully read folder of CSVs")
input_data, _ = ReadCsv(user_config=config).read(input_csvs)
elif args.input_datafile:
input_data, _ = ReadDatafile(user_config=config).read(args.input_datafile)
Expand Down Expand Up @@ -208,6 +210,7 @@ def conversion_matrix(args):
"Reading from datapackage is deprecated, trying to read from CSVs"
)
from_path = read_deprecated_datapackage(from_path)
logger.info("Successfully read folder of CSVs")
read_strategy = ReadCsv(user_config=config, keep_whitespace=keep_whitespace)
elif args.from_format == "csv":
read_strategy = ReadCsv(user_config=config, keep_whitespace=keep_whitespace)
Expand Down Expand Up @@ -334,6 +337,11 @@ def get_parser():
help="Input GNUMathProg datafile required for OSeMOSYS short or fast results",
default=None,
)
result_parser.add_argument(
"--input_datapackage",
help="Deprecated",
default=None,
)
result_parser.add_argument("config", help="Path to config YAML file")
result_parser.add_argument(
"--write_defaults",
Expand Down Expand Up @@ -432,6 +440,12 @@ def get_parser():
return parser


class DeprecateAction(argparse.Action):
def __call__(self, parser, namespace, values, option_string=None):
logger.warning(f"Argument {self.option_strings} is deprecated and is ignored.")
delattr(namespace, self.dest)


def main():

parser = get_parser()
Expand Down

0 comments on commit f0bb9a3

Please sign in to comment.