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

let fre cmor run process tripolar ocean data #303

Merged
merged 50 commits into from
Jan 16, 2025
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
6dce8ef
add in cmip6-cmor-tables as a submodule, remove un-maintained gitpyth…
ilaflott Dec 24, 2024
f59bd87
i guess .gitmodules isnt meant to be edited by hand!
ilaflott Dec 24, 2024
1168d5d
Revert "i guess .gitmodules isnt meant to be edited by hand!"
ilaflott Dec 24, 2024
a197538
actually add the submodule...
ilaflott Dec 24, 2024
ff8d8ce
restore deps with the exception of the pip-installed gitpython and le…
ilaflott Dec 24, 2024
32abb9b
syntax error
ilaflott Dec 24, 2024
ac61693
whitespace-cleanup some files for lint complaints, poke the test file…
ilaflott Dec 24, 2024
91a0fbc
add pyproject.toml to suppress pip warning.
ilaflott Jan 3, 2025
176ea9d
Merge branch 'main' into 298-cmor-process-ocean-tripolar-grid
ilaflott Jan 3, 2025
cec2a12
trying to get a fre make test's output out of the way, getting surpri…
ilaflott Jan 3, 2025
e5daf46
Update meta.yaml
ilaflott Jan 3, 2025
0c0b45d
Merge branch 'main' into 298-cmor-process-ocean-tripolar-grid
ilaflott Jan 6, 2025
fe0a656
remove a sys.exit or two. restore os.environ[HOME] back to what it wa…
ilaflott Jan 6, 2025
9122ef3
Merge branch '298-cmor-process-ocean-tripolar-grid' of https://github…
ilaflott Jan 6, 2025
3260539
oops
ilaflott Jan 6, 2025
50498e2
update click scaffolding to be much more lean and mean. approach cour…
ilaflott Jan 6, 2025
c92e4e8
removing now-redundant click-scaffoldding from fre app, fre check, fr…
ilaflott Jan 6, 2025
58c83c1
fix an oops, apply same approach to fre/catalog
ilaflott Jan 6, 2025
3e0096e
apply click-redundancy-removal logic to fre make
ilaflott Jan 6, 2025
19bc7a1
Revert "fix an oops, apply same approach to fre/catalog"
ilaflott Jan 6, 2025
aef76ee
remove needless shebang, put fre catalog click scaffolding back where…
ilaflott Jan 6, 2025
e03e098
fix the silly colon-oops in fre.pp again
ilaflott Jan 6, 2025
e832807
fix another syntax oops. change sys.exit to return
ilaflott Jan 6, 2025
1a01de9
more getting tests etc to clean up after themselves
ilaflott Jan 6, 2025
ada0dc7
#no more shebangs! (getit?)
ilaflott Jan 6, 2025
ab2708e
edits addressing pylint complains about no value for arguments in calls
ilaflott Jan 6, 2025
bc4a39b
further edits addressing pylint complains about no value for argument…
ilaflott Jan 6, 2025
67b67ee
notimplementederrors raised on functions not-yet-used. uncomment the …
ilaflott Jan 6, 2025
a074922
remove useless __init__ files in test directories. more pylint edits.
ilaflott Jan 6, 2025
fb62498
why last failure? unconvinced. fail again, conda_build, i dare you.
ilaflott Jan 7, 2025
21e22b4
adjust import statement in fre/cmor/tests
ilaflott Jan 7, 2025
54e02e3
carefully tidy print statements, carefully changing order of certain …
ilaflott Jan 7, 2025
d6013a6
new cmor_helpers file holds helper functions
ilaflott Jan 9, 2025
5911351
SO CLOSE
ilaflott Jan 9, 2025
dfe9ccb
pretty sure i got it!
ilaflott Jan 9, 2025
6d788b1
remove scratchwork script.
ilaflott Jan 9, 2025
8a3816e
Merge branch 'main' into 298-cmor-process-ocean-tripolar-grid
ilaflott Jan 9, 2025
baf61dc
lets just make run_test_file_cases a bunch of xfail pytests with a *p…
ilaflott Jan 13, 2025
8a71625
Merge branch 'main' into 298-cmor-process-ocean-tripolar-grid
ilaflott Jan 13, 2025
da8b4d3
ok got a format and a conditional pytest.xfail approach i am OK with.…
ilaflott Jan 13, 2025
5d7f77d
cleaner tests, all should xfail appropriately in the CI/CD
ilaflott Jan 13, 2025
1c987da
pylint things. rename cmor_lister to cmor_finder to avoid clash with …
ilaflott Jan 13, 2025
aa6c612
fix an oops in the fre cmor cli tests. tweak pytest.ini trivially
ilaflott Jan 13, 2025
fd73c43
update workflow file to upload the coverage xml for inspection. chang…
ilaflott Jan 13, 2025
c428716
why no coverage badge?? smh..
ilaflott Jan 13, 2025
dd21a0c
put coveragerc and pytest.ini back to what they were... sorry for tou…
ilaflott Jan 13, 2025
2d6730e
add */tests/__init__.py files back in... blegh
ilaflott Jan 13, 2025
be4af5c
another testing init file
ilaflott Jan 13, 2025
1923e6d
adjust pytest calls in workflows to use coverage to call pytest as mo…
ilaflott Jan 13, 2025
41a99f2
whitespace newlines and fstrings thanks pylint you great friend
ilaflott Jan 13, 2025
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
Prev Previous commit
Next Next commit
oops
ilaflott committed Jan 6, 2025
commit 3260539a843be304b12a677526cc55746a40be56
6 changes: 0 additions & 6 deletions fre/tests/test_fre_make_cli.py
Original file line number Diff line number Diff line change
@@ -8,9 +8,6 @@

runner = CliRunner()

def test_sanity1():
assert Path(os.getcwd()).name == "fre-cli"

def test_cli_fre_make():
''' fre make '''
result = runner.invoke(fre.fre, args=["make"])
@@ -79,9 +76,6 @@ def test_cli_fre_make_create_checkout_container():
Path(f"tmp/{platform}/checkout.sh").exists(),
os.access(Path(f"tmp/{platform}/checkout.sh"), os.X_OK) == False ])

def test_sanity2():
assert Path(os.getcwd()).name == "fre-cli"

def test_cli_fre_make_create_checkout_cleanup():
''' make sure the checked out code doesnt stick around to mess up another pytest call '''
assert Path(OUT_PATH).exists()