Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
0b3b9f1
Remove title and make key and name consistent
yvonnefroehlich Feb 7, 2024
5342d89
Adjust load functions
yvonnefroehlich Feb 7, 2024
6f37e01
Adjust error message
yvonnefroehlich Feb 7, 2024
7d45695
Adjust documentation
yvonnefroehlich Feb 7, 2024
178c6f3
Make documentation and long_name consistent
yvonnefroehlich Feb 7, 2024
16926f3
Adjust tests
yvonnefroehlich Feb 7, 2024
b38635f
Adjust tutorial 'grid_equalization.py'
yvonnefroehlich Feb 7, 2024
57be08d
Adjust earth_age test
yvonnefroehlich Feb 7, 2024
28df448
Fix typo
yvonnefroehlich Feb 7, 2024
bfd447b
Adjust test 'load_remote_datasets'
yvonnefroehlich Feb 7, 2024
83b647f
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Feb 17, 2024
74d9bc8
Fix typo
yvonnefroehlich Mar 1, 2024
15f42b7
Separte Earth relief dataset in 'igpp' and 'gebco'
yvonnefroehlich Mar 4, 2024
3b999e7
Sort alphabetically
yvonnefroehlich Mar 4, 2024
582235c
Adjust tests
yvonnefroehlich Mar 4, 2024
3ca6f32
Fix programming language
yvonnefroehlich Mar 4, 2024
098b45a
Fix typo
yvonnefroehlich Mar 4, 2024
2393ec4
Fix tutorial
yvonnefroehlich Mar 4, 2024
d2b2c43
Shorten documentation
yvonnefroehlich Mar 9, 2024
02cc018
Use 'earth_mag' instead of 'earth_emag'
yvonnefroehlich Mar 9, 2024
d09db24
Use 'earth_mag' instead of 'earth_emag'
yvonnefroehlich Mar 9, 2024
36cf851
Adjust test
yvonnefroehlich Mar 9, 2024
24055f5
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 9, 2024
fabae4c
TEST - Change keyword
yvonnefroehlich Mar 9, 2024
4d160fc
TEST - Change keyword back
yvonnefroehlich Mar 9, 2024
25b98bf
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 10, 2024
39085c7
TEST - Remove 'grid_equalization' tutorial
yvonnefroehlich Mar 10, 2024
48608f2
Revert "TEST - Remove 'grid_equalization' tutorial"
yvonnefroehlich Mar 10, 2024
6aa8e74
Adjust keyword
yvonnefroehlich Mar 10, 2024
7c5f27a
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 10, 2024
9b6b8ff
Adjust name for emag2 dataset
yvonnefroehlich Mar 11, 2024
7a59250
Adjust name for wdmam dataset
yvonnefroehlich Mar 11, 2024
ab00c93
Sort alphabeticaly
yvonnefroehlich Mar 11, 2024
4636eb0
Adjust tests
yvonnefroehlich Mar 11, 2024
4058691
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 11, 2024
36a8efe
Fix tests, names | Use upper case letters related to shortcut
yvonnefroehlich Mar 11, 2024
1779461
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 13, 2024
001c7b2
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 17, 2024
5fb9748
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 18, 2024
2856008
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Mar 19, 2024
7db4edf
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Apr 5, 2024
6af2390
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Apr 18, 2024
e4b27bb
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Apr 21, 2024
8a7e317
Use 'z' as 'name' and 'quanity_unit' as 'long_name' attributes
yvonnefroehlich Apr 21, 2024
a39f44a
[format-command] fixes
actions-bot Apr 21, 2024
d385716
Fix
yvonnefroehlich Apr 21, 2024
3d07d7a
Fix coding style
yvonnefroehlich Apr 21, 2024
9311971
Fix
yvonnefroehlich Apr 21, 2024
4add858
Fix input data type
yvonnefroehlich Apr 21, 2024
ae29f76
Fix
yvonnefroehlich Apr 21, 2024
9f2b747
Fix
yvonnefroehlich Apr 21, 2024
1df4324
Test testing 'description' attribut
yvonnefroehlich Apr 21, 2024
eec68ec
Move 'description' attribut to 'extra_attributes'
yvonnefroehlich Apr 21, 2024
e75a6d1
Revert changes
yvonnefroehlich Apr 21, 2024
d4541ad
Revert changes
yvonnefroehlich Apr 21, 2024
5f508db
Add 'description attribut
yvonnefroehlich Apr 21, 2024
59e042f
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Apr 22, 2024
26ff532
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Apr 23, 2024
2f95200
Use match-case statements
yvonnefroehlich Apr 23, 2024
04bf516
Remove setting the 'name' and 'long_name' attributes
yvonnefroehlich Apr 23, 2024
d7a8ea0
Remove setting the 'name' and 'long_name' attributes
yvonnefroehlich Apr 23, 2024
3c4cde7
Remove setting the 'name' and 'long_name' attributes
yvonnefroehlich Apr 23, 2024
7418d6d
Update tests
yvonnefroehlich Apr 23, 2024
1546ada
Update tests
yvonnefroehlich Apr 23, 2024
2772e2d
Update example of 'grd2xyz'
yvonnefroehlich Apr 23, 2024
4f9def4
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Apr 23, 2024
67f31cf
Merge branch 'main' into adjust-names-datasets
seisman Apr 24, 2024
32e3349
Merge branch 'main' into adjust-names-datasets
yvonnefroehlich Apr 24, 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
Prev Previous commit
Next Next commit
Update tests
  • Loading branch information
yvonnefroehlich committed Apr 23, 2024
commit 7418d6d8db31f2650e4d7a55065bebc1190421f9
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_earth_age.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_earth_age_01d():
"""
data = load_earth_age(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "age_Myr"
assert data.attrs["long_name"] == "ages (Myr)"
assert data.attrs["description"] == "EarthByte Earth seafloor crustal age"
assert data.attrs["units"] == "Myr"
assert data.attrs["horizontal_datum"] == "WGS84"
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_earth_free_air_anomaly.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_earth_faa_01d():
"""
data = load_earth_free_air_anomaly(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "gravity_mGal"
assert data.attrs["long_name"] == "ffa (mGal)"
assert data.attrs["description"] == "IGPP Earth free-air anomaly"
assert data.attrs["units"] == "mGal"
assert data.attrs["horizontal_datum"] == "WGS84"
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_earth_geoid.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_earth_geoid_01d():
"""
data = load_earth_geoid(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "geoid (m)"
assert data.attrs["description"] == "EGM2008 Earth geoid"
assert data.attrs["units"] == "m"
assert data.attrs["horizontal_datum"] == "WGS84"
Expand Down
6 changes: 3 additions & 3 deletions pygmt/tests/test_datasets_earth_magnetic_anomaly.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def test_earth_mag_01d():
"""
data = load_earth_magnetic_anomaly(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "magntic_field_nT"
assert data.attrs["long_name"] == "anomaly (nT)"
assert data.attrs["description"] == "EMAG2 Earth Magnetic Anomaly Model"
assert data.attrs["units"] == "nT"
assert data.attrs["horizontal_datum"] == "WGS84"
Expand Down Expand Up @@ -62,7 +62,7 @@ def test_earth_mag4km_01d():
"""
data = load_earth_magnetic_anomaly(resolution="01d", data_source="emag2_4km")
assert data.name == "z"
assert data.attrs["long_name"] == "magntic_field_nT"
assert data.attrs["long_name"] == "anomaly (nT)"
assert data.attrs["description"] == "EMAG2 Earth Magnetic Anomaly Model"
assert data.attrs["units"] == "nT"
assert data.attrs["horizontal_datum"] == "WGS84"
Expand Down Expand Up @@ -119,7 +119,7 @@ def test_earth_mag_01d_wdmam():
resolution="01d", registration="gridline", data_source="wdmam"
)
assert data.name == "z"
assert data.attrs["long_name"] == "magnetic_field_nT"
assert data.attrs["long_name"] == "anomaly (nT)"
assert data.attrs["description"] == "WDMAM World Digital Magnetic Anomaly Map"
assert data.attrs["units"] == "nT"
assert data.attrs["horizontal_datum"] == "WGS84"
Expand Down
4 changes: 2 additions & 2 deletions pygmt/tests/test_datasets_earth_relief.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_earth_relief_01d_igpp_synbath(data_source):
"""
data = load_earth_relief(resolution="01d", data_source=data_source)
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "elevation (m)"
assert data.attrs["description"] == "IGPP Earth relief"
assert data.attrs["units"] == "meters"
assert data.attrs["vertical_datum"] == "EGM96"
Expand All @@ -39,7 +39,7 @@ def test_earth_relief_01d_gebco(data_source):
"""
data = load_earth_relief(resolution="01d", data_source=data_source)
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "elevation (m)"
assert data.attrs["description"] == "GEBCO Earth relief"
assert data.attrs["units"] == "meters"
assert data.attrs["vertical_datum"] == "EGM96"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_earth_vertical_gravity_gradient_01d():
"""
data = load_earth_vertical_gravity_gradient(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "gravity_gradient_E"
assert data.attrs["long_name"] == "vgg (E)"
assert data.attrs["description"] == "IGPP Earth vertical gravity gradient"
assert data.attrs["units"] == "Eotvos"
assert data.attrs["horizontal_datum"] == "WGS84"
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_mars_relief.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_mars_relief_01d():
"""
data = load_mars_relief(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "elevation (m)"
assert data.attrs["description"] == "NASA Mars (MOLA) relief"
assert data.attrs["units"] == "meters"
assert data.shape == (181, 361)
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_mercury_relief.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_mercury_relief_01d():
"""
data = load_mercury_relief(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "elevation (m)"
assert data.attrs["description"] == "USGS Mercury relief"
assert data.attrs["units"] == "meters"
assert data.shape == (181, 361)
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_moon_relief.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_moon_relief_01d():
"""
data = load_moon_relief(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "elevation (m)"
assert data.attrs["description"] == "USGS Moon (LOLA) relief"
assert data.attrs["units"] == "meters"
assert data.shape == (181, 361)
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_pluto_relief.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_pluto_relief_01d():
"""
data = load_pluto_relief(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "elevation (m)"
assert data.attrs["description"] == "USGS Pluto relief"
assert data.attrs["units"] == "meters"
assert data.shape == (181, 361)
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets_venus_relief.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_venus_relief_01d():
"""
data = load_venus_relief(resolution="01d")
assert data.name == "z"
assert data.attrs["long_name"] == "elevation_m"
assert data.attrs["long_name"] == "elevation (m)"
assert data.attrs["description"] == "NASA Magellan Venus relief"
assert data.attrs["units"] == "meters"
assert data.shape == (181, 361)
Expand Down