diff --git a/CHANGELOG.md b/CHANGELOG.md index 534a6a9..c164bfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ 2024-08 +- 1.4.2: + - renamed `pbp` CLI program to `pbp-hmb-gen` + - 1.4.1 - HMB generation CLI now with `--s3-unsigned` option to use unsigned config. - 1.4.0 with improved "meta-gen" functionality diff --git a/justfile b/justfile index e68c9fd..f44e9c4 100644 --- a/justfile +++ b/justfile @@ -32,7 +32,7 @@ tgz: # Run main (on gizo) main-gizo date="20220902" output_dir="/PAM_Analysis/pypam-space/test_output/daily": - PYTHONPATH=. poetry run python pbp/main.py \ + PYTHONPATH=. poetry run python pbp/main_hmb_generator.py \ --json-base-dir=json \ --date={{date}} \ --voltage-multiplier=3 \ @@ -43,7 +43,7 @@ main-gizo date="20220902" output_dir="/PAM_Analysis/pypam-space/test_output/dail # Run main (on gizo) with some initial test jsons main-gizo-test *more_args="": - PYTHONPATH=. poetry run python pbp/main.py \ + PYTHONPATH=. poetry run python pbp/main_hmb_generator.py \ --json-base-dir=tests/json \ --date=20220902 \ --voltage-multiplier=3 \ @@ -67,7 +67,7 @@ main-gizo-multiple-days year month *days="": base="$output_dir/milli_psd_$date" out="$base.out" echo "running: day=$day output_dir=$output_dir" - poetry run python pbp/main.py \ + poetry run python pbp/main_hmb_generator.py \ --json-base-dir=json \ --date="$date" \ --voltage-multiplier=3 \ @@ -87,7 +87,7 @@ main-mb05 *more_args="": mkdir -p NB_SPACE/OUTPUT PYTHONPATH=. EXCLUDE_LOG_TIME=yes \ - poetry run python pbp/main.py \ + poetry run python pbp/main_hmb_generator.py \ --date=20220812 \ --json-base-dir=NB_SPACE/JSON \ --voltage-multiplier=1 \ @@ -113,7 +113,7 @@ main-nrs11 date='20200101' *more_args='': mkdir -p $WS/DOWNLOADS mkdir -p $WS/OUTPUT PYTHONPATH=. EXCLUDE_LOG_TIME=yes \ - poetry run python pbp/main.py \ + poetry run python pbp/main_hmb_generator.py \ --date={{date}} \ --gs \ --json-base-dir=$WS/noaa-passive-bioacoustic_nrs_11_2019-2021 \ @@ -139,7 +139,7 @@ main-nrs11-multiple-days year month *days="": export PYTHONPATH=. for day in {{days}}; do date=$(printf "%04d%02d%02d" {{year}} {{month}} "$day") - poetry run python pbp/main.py \ + poetry run python pbp/main_hmb_generator.py \ --date="$date" \ --gs \ --json-base-dir=$WS/noaa-passive-bioacoustic_nrs_11_2019-2021 \ @@ -231,7 +231,7 @@ main-cloud-chumash-basic-test date="20230108": # Run main main *args="": - PYTHONPATH=. poetry run python pbp/main.py {{args}} + PYTHONPATH=. poetry run python pbp/main_hmb_generator.py {{args}} ############## # misc/utils: diff --git a/pbp/main.py b/pbp/main_hmb_generator.py similarity index 97% rename from pbp/main.py rename to pbp/main_hmb_generator.py index 3f8d020..4c3bbab 100644 --- a/pbp/main.py +++ b/pbp/main_hmb_generator.py @@ -1,4 +1,4 @@ -from pbp.main_args import parse_arguments +from pbp.main_hmb_generator_args import parse_arguments # Some imports, in particular involving data processing, cause a delay that is # noticeable when just running the --help option. We get around this issue by diff --git a/pbp/main_args.py b/pbp/main_hmb_generator_args.py similarity index 100% rename from pbp/main_args.py rename to pbp/main_hmb_generator_args.py diff --git a/poetry.lock b/poetry.lock index e214a72..553fcca 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3669,18 +3669,22 @@ test = ["pytest"] [[package]] name = "zipp" -version = "3.20.0" +version = "3.20.1" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.20.0-py3-none-any.whl", hash = "sha256:58da6168be89f0be59beb194da1250516fdaa062ccebd30127ac65d30045e10d"}, - {file = "zipp-3.20.0.tar.gz", hash = "sha256:0145e43d89664cfe1a2e533adc75adafed82fe2da404b4bbb6b026c0157bdb31"}, + {file = "zipp-3.20.1-py3-none-any.whl", hash = "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064"}, + {file = "zipp-3.20.1.tar.gz", hash = "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"}, ] [package.extras] +check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"] +cover = ["pytest-cov"] doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] +enabler = ["pytest-enabler (>=2.2)"] +test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"] +type = ["pytest-mypy"] [metadata] lock-version = "2.0" diff --git a/pyproject.toml b/pyproject.toml index ed98c55..3532d6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "mbari-pbp" -version = "1.4.1" +version = "1.4.2" description = "PyPAM based Processing" authors = [ "Carlos Rueda ", @@ -17,7 +17,7 @@ repository = "https://github.com/mbari-org/pbp" packages = [{include = "pbp"}] [tool.poetry.scripts] -pbp = "pbp.main:main" +pbp-hmb-gen = "pbp.main_hmb_generator:main" pbp-cloud = "pbp.main_cloud:main" pbp-plot = "pbp.plot:main" pbp-meta-gen = "pbp.main_meta_generator:main" diff --git a/scripts/mb05.sh b/scripts/mb05.sh index e319a22..00035c8 100755 --- a/scripts/mb05.sh +++ b/scripts/mb05.sh @@ -11,7 +11,7 @@ instrument="SoundTrap ST600 HF, SN 6999" for month in $months; do for day in $days; do date=$(printf "%04d%02d%02d" "$year" "$month" "$day") - python src/main.py \ + python src/main_hmb_generator.py \ --audio-path-map-prefix="s3://pacific-sound-mb05/~/PAM_Archive/MB05/202211_6999/" \ --date="$date" \ --json-base-dir="/PAM_Analysis/JSON/mb05" \