Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLI Tools, CLI for Steps 1-7 #88

Merged
merged 73 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
61f6a7f
feat: clitools and cli for step1
cpaniaguam Jan 31, 2024
be79808
update: deps and ci runner for step1
cpaniaguam Jan 31, 2024
3e811c4
feat: use cli for step 1 in CI
cpaniaguam Jan 31, 2024
f228887
feat: add cli to step 2 -- B02_make_spectra_gFT.py
cpaniaguam Jan 31, 2024
cff2932
fix: remove non-cli commands from ci
cpaniaguam Jan 31, 2024
d53246b
fix: remove non-cli commands
cpaniaguam Jan 31, 2024
9f32f28
feat: cli step 2 -- b03_plot_spectra_ovpy
cpaniaguam Jan 31, 2024
dc19274
feat: cli step 4 -- A02c_IOWAGA_thredds_prior
cpaniaguam Jan 31, 2024
a8f4d8e
Merge branch '87-cli-step-1-b01_sl_load_single_filepy' into 95-cli-st…
cpaniaguam Feb 5, 2024
f5ff2c8
feat: add cli to B04_angle
cpaniaguam Feb 5, 2024
2b25637
feat: conditional output suppression
cpaniaguam Feb 5, 2024
49fb7ab
fix: echo with white => print
cpaniaguam Feb 5, 2024
ce4a5b4
fix: paths
cpaniaguam Feb 5, 2024
cc5e459
fix: move pytest to dev deps
cpaniaguam Feb 6, 2024
8027256
feat: update test workflow and add new CLI commands
cpaniaguam Feb 6, 2024
8d7b8b8
Merge branch 'main' into 87-cli-step-1-b01_sl_load_single_filepy
cpaniaguam Feb 6, 2024
6e8fdbf
Merge branch '87-cli-step-1-b01_sl_load_single_filepy' into 89-cli-st…
kmilo9999 Feb 6, 2024
1e75dca
fix: update B01_SL_load_single_file.py
cpaniaguam Feb 6, 2024
494ab91
ci: revert to running steps with cli only
cpaniaguam Feb 6, 2024
9d6015e
fix: typo in test command for icesat2waves app
cpaniaguam Feb 6, 2024
08c3295
update: pyproject.toml and ci for step2
cpaniaguam Feb 6, 2024
2c83529
Merge branch '87-cli-step-1-b01_sl_load_single_filepy' into 89-cli-st…
kmilo9999 Feb 6, 2024
0e05e8a
refactor: ci and pyproject.toml
cpaniaguam Feb 6, 2024
a2a2c97
Merge branch '89-cli-step-2-b02_make_spectra_gft' of https://github.c…
cpaniaguam Feb 6, 2024
84941b4
Merge branch '89-cli-step-2-b02_make_spectra_gft' into 91-cli-step-3-…
cpaniaguam Feb 6, 2024
8faca84
Merge branch '91-cli-step-3-b03_plot_spectra_ovpy' into 93-cli-step-4…
cpaniaguam Feb 6, 2024
5b3d6f3
Merge branch '93-cli-step-4-a02c_iowaga_thredds_priorpy' into 95-cli-…
cpaniaguam Feb 6, 2024
95120c2
feat: add verbose flag
cpaniaguam Feb 7, 2024
f6c1175
feat: add verbose/no-verbose mode
cpaniaguam Feb 7, 2024
1547c62
feat: add verbose/no-verbose mode
cpaniaguam Feb 7, 2024
db69aca
feat: add verbose/no-verbose mode
cpaniaguam Feb 7, 2024
2010d82
feat: add verbose/no-verbose mode
cpaniaguam Feb 7, 2024
ce4483a
fix: make output_dir a required argument
cpaniaguam Feb 7, 2024
e21f21d
refactor: simply logic in update_paths_mconfig
cpaniaguam Feb 7, 2024
2d6bd24
cli integration with step 7
kmilo9999 Feb 7, 2024
7bcf1df
Merge branch '95-cli-step-5-b04_anglepy' into cli-step-7-b06_correct
kmilo9999 Feb 7, 2024
9f540bd
refactor: B05_define_angle
cpaniaguam Feb 7, 2024
223a971
refactor: script names and app names
cpaniaguam Feb 7, 2024
bf1ae92
refactor: B04_angle
cpaniaguam Feb 7, 2024
8b73445
fix: update .gitignore
cpaniaguam Feb 7, 2024
8cb5684
fix: format dev/test deps vertically
cpaniaguam Feb 7, 2024
ce0aeeb
refactor: comment tracemalloc
cpaniaguam Feb 9, 2024
c31b74f
fix: restore "x" from "dist"
cpaniaguam Feb 9, 2024
8f56be8
fix: typo in make-spectra command
cpaniaguam Feb 9, 2024
1a3ac31
refactor: display input args B02_make_spectra_gFT.py
cpaniaguam Feb 9, 2024
b6e8e56
Merge branch '93-cli-step-4-a02c_iowaga_thredds_priorpy' into 95-cli-…
cpaniaguam Feb 9, 2024
7d7e0f7
fix: iowaga app name
cpaniaguam Feb 9, 2024
38ed437
refactor: iowaga thedds prior
cpaniaguam Feb 10, 2024
226ff10
Merge branch '93-cli-step-4-a02c_iowaga_thredds_priorpy' into 95-cli-…
cpaniaguam Feb 10, 2024
5e766a2
merge with 95-cli-step-5-b04_anglepy branch
kmilo9999 Feb 11, 2024
2a78310
Merge branch '89-cli-step-2-b02_make_spectra_gft' into 91-cli-step-3-…
cpaniaguam Feb 12, 2024
6a92da3
Merge branch '95-cli-step-5-b04_anglepy' into 112-cli-step-6-b04_defi…
cpaniaguam Feb 12, 2024
cbbd82a
refactor: paths and some functions, classes
cpaniaguam Feb 12, 2024
e94f9f2
feat: define-angle cli (step 6)
cpaniaguam Feb 12, 2024
251035d
step7 integrated with CLI
kmilo9999 Feb 12, 2024
94acc57
fix: typo
cpaniaguam Feb 12, 2024
95ecc09
PR review with carlos. Fixed step7 CLI integration
kmilo9999 Feb 13, 2024
a04760e
Fixed type-app command name for step7
kmilo9999 Feb 13, 2024
32cb328
fixed typer command for step7
kmilo9999 Feb 13, 2024
726922b
fix: always show input params
cpaniaguam Feb 13, 2024
f372f15
refactor: suppress_stdout
cpaniaguam Feb 15, 2024
e6df9b2
refactor: variable assignment in B05_define_angle.py
cpaniaguam Feb 15, 2024
f002ded
fix: path in B03_plot_spectra_ov.py
cpaniaguam Feb 16, 2024
e545447
refactor: Remove unused variables and directories in B02_make_spectra…
cpaniaguam Feb 16, 2024
bffc888
Merge branch '112-cli-step-6-b04_define_anglepy' into cli-step-7-b06_…
kmilo9999 Feb 16, 2024
bca4f19
Merge pull request #113 from brown-ccv/cli-step-7-b06_correct
kmilo9999 Feb 16, 2024
de92efe
Merge pull request #115 from brown-ccv/112-cli-step-6-b04_define_anglepy
cpaniaguam Feb 16, 2024
99aa0de
Merge pull request #111 from brown-ccv/95-cli-step-5-b04_anglepy
cpaniaguam Feb 16, 2024
2857c69
Merge branch '91-cli-step-3-b03_plot_spectra_ovpy' of https://github.…
cpaniaguam Feb 17, 2024
f0cede1
Merge pull request #94 from brown-ccv/93-cli-step-4-a02c_iowaga_thred…
cpaniaguam Feb 17, 2024
b7ab105
Merge pull request #92 from brown-ccv/91-cli-step-3-b03_plot_spectra_…
cpaniaguam Feb 17, 2024
a39430a
Merge branch '87-cli-step-1-b01_sl_load_single_filepy' into 89-cli-st…
cpaniaguam Feb 17, 2024
f3c28c7
Merge pull request #90 from brown-ccv/89-cli-step-2-b02_make_spectra_gft
cpaniaguam Feb 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/test-B01_SL_load_single_file.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test B01_SL_load_single_file
name: Test Steps
on:
pull_request: {}
push:
Expand All @@ -23,8 +23,12 @@ jobs:
run: pip install .
- name: List dependencies
run: pip list
- name: test icesat2waves app
run: icesat2waves --help
- name: test command for step 1
run: load_single_file --help
- name: first step B01_SL_load_single_file
run: python src/icesat2_tracks/analysis_db/B01_SL_load_single_file.py 20190502052058_05180312_005_01 SH_testSLsinglefile2 True
run: python src/icesat2_tracks/analysis_db/B01_SL_load_single_file.py --track-name 20190502052058_05180312_005_01 --batch-key SH_testSLsinglefile2 --output-dir .
- name: second step make_spectra
run: python src/icesat2_tracks/analysis_db/B02_make_spectra_gFT.py SH_20190502_05180312 SH_testSLsinglefile2 True
- name: third step plot_spectra
Expand All @@ -37,4 +41,3 @@ jobs:
run: python src/icesat2_tracks/analysis_db/B05_define_angle.py SH_20190502_05180312 SH_testSLsinglefile2 True
- name: Seventh step B06_correct_separate_var
run: python src/icesat2_tracks/analysis_db/B06_correct_separate_var.py SH_20190502_05180312 SH_testSLsinglefile2 True

9 changes: 7 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ dependencies = [ # Optional
"emcee >=3.1.4, <4.0.0",
"netCDF4 >=1.6.5, <2.0.0",
"siphon >=0.9, <1.0.0",
"h5py >=3.5.0, < 4.0.0"
"h5py >=3.5.0, < 4.0.0",
"termcolor >=2.4.0, < 3.0.0",
"typer >=0.9.0, < 1.0.0",
]

# List additional groups of dependencies here (e.g. development
Expand All @@ -133,7 +135,7 @@ dependencies = [ # Optional
# projects.
[project.optional-dependencies] # Optional
dev = ["check-manifest","black","icesat2-tracks[test]"]
test = ["coverage"]
test = ["coverage", "pytest >=7.4.4, <8.0.0", "pytest-xdist >=3.5.0, <4.0.0"]
cpaniaguam marked this conversation as resolved.
Show resolved Hide resolved

# List URLs that are relevant to your project
#
Expand All @@ -155,6 +157,9 @@ test = ["coverage"]
[project.scripts] # Optional
#TODO: ADD ANY SCRIPTS WE WANT TO HAVE
download = "icesat2_tracks.icesat2_tools_scripts.nsidc_icesat2_associated2:main"
load_single_file = "icesat2_tracks.analysis_db.B01_SL_load_single_file:step1app"
icesat2waves = "icesat2_tracks.app:app"


# This is configuration specific to the `setuptools` build backend.
# If you are using a different build backend, you will need to change this.
Expand Down
Loading
Loading