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.

Sign up for GitHub

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

Jump to bottom

Include dict #361

Merged
merged 13 commits into from
Sep 7, 2023
Merged

Include dict #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db89252
Add what is required to export dictionaries
daniel-sol Jul 5, 2023
a6f097f
Add what is required to export dictionaries
daniel-sol Jul 5, 2023
8a9439e
rebase main
daniel-sol Jul 7, 2023
c66abe8
Add some dictionary tests
daniel-sol Jul 7, 2023
bf11ea4
Make more tests for dictionaries
daniel-sol Jul 10, 2023
239988c
Add docstring
daniel-sol Jul 10, 2023
e875431
Change naming of class and go for JSON as only format
daniel-sol Jul 10, 2023
1d41051
Lint
daniel-sol Jul 11, 2023
ae0aa7c
Change docstring
daniel-sol Jul 11, 2023
091bf8d
Add in class enum
adnejacobsen Sep 4, 2023
9267d73
add as an allowed content
adnejacobsen Sep 4, 2023
bcfab63
Merge branch 'main' into include_dict
adnejacobsen Sep 4, 2023
8a35ea4
lint
adnejacobsen Sep 4, 2023
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
3 changes: 2 additions & 1 deletion schema/definitions/0.8.0/schema/fmu_results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@
"polygons",
"cube",
"well",
"points"
"points",
"dictionary"
]
},
"source": {
Expand Down
1 change: 1 addition & 0 deletions src/fmu/dataio/_definitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def __post_init__(self):
"khproduct": None,
"timeseries": None,
"wellpicks": None,
"parameters": None,
}

STANDARD_TABLE_INDEX_COLUMNS = {
Expand Down
4 changes: 2 additions & 2 deletions tests/test_units/test_dictionary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def test_export_dict_w_meta(globalconfig2, dictionary, request):
name = dictionary
in_dict = request.getfixturevalue(dictionary)
print(f"{name}: {in_dict}")
exd = ExportData(config=globalconfig2)
exd = ExportData(config=globalconfig2, content="parameters")
out_dict, out_meta = read_dict_and_meta(exd.export(in_dict, name=name))
assert in_dict == out_dict
assert_dict_correct(out_dict, out_meta, name)
Expand All @@ -131,7 +131,7 @@ def test_invalid_dict(globalconfig2, drogon_summary, drogon_volumes):
drogon_volumes (pa.Table): a pyarrow table
"""
in_dict = {"volumes": drogon_volumes, "summary": drogon_summary}
exd = ExportData(config=globalconfig2)
exd = ExportData(config=globalconfig2, content="parameters")
with pytest.raises(TypeError) as exc_info:
print(exc_info)
exd.export(in_dict, name="invalid")
Expand Down
Loading