Skip to content

Commit

Permalink
make sure logging options are applied when calling populators directly
Browse files Browse the repository at this point in the history
  • Loading branch information
mishaschwartz committed Oct 17, 2024
1 parent eeeb6ae commit b353feb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
3 changes: 1 addition & 2 deletions STACpopulator/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
import sys
from types import ModuleType
import warnings
from typing import Callable

from STACpopulator import __version__, implementations
from STACpopulator.exceptions import STACPopulatorError
from STACpopulator.log import setup_logging


def add_parser_args(parser: argparse.ArgumentParser) -> dict[str, Callable]:
def add_parser_args(parser: argparse.ArgumentParser) -> None:
parser.add_argument(
"--version",
"-V",
Expand Down
5 changes: 3 additions & 2 deletions STACpopulator/implementations/CMIP6_UofT/add_CMIP6.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from pystac.extensions.datacube import DatacubeExtension
from requests.sessions import Session

from STACpopulator import cli
from STACpopulator.log import add_logging_options
from STACpopulator.request_utils import add_request_options, apply_request_options
from STACpopulator.extensions.cmip6 import CMIP6Helper, CMIP6Properties
Expand Down Expand Up @@ -131,8 +132,8 @@ def main(*args: str) -> int:
parser = argparse.ArgumentParser()
add_parser_args(parser)
ns = parser.parse_args(args or None)
return runner(ns)

ns.populator = "CMIP6_UofT"
return cli.run(ns)

if __name__ == "__main__":
sys.exit(main())
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from requests.sessions import Session

from STACpopulator import cli
from STACpopulator.log import add_logging_options
from STACpopulator.request_utils import add_request_options, apply_request_options
from STACpopulator.input import STACDirectoryLoader
Expand Down Expand Up @@ -72,7 +73,8 @@ def main(*args: str) -> int:
parser = argparse.ArgumentParser()
add_parser_args(parser)
ns = parser.parse_args(args or None)
return runner(ns)
ns.populator = "DirectoryLoader"
return cli.run(ns)


if __name__ == "__main__":
Expand Down

0 comments on commit b353feb

Please sign in to comment.