Skip to content

Commit

Permalink
Merge pull request #8 from alekfal/development
Browse files Browse the repository at this point in the history 
Remove lazy-fixture dependency and fix test paths
  • Loading branch information
@alekfal
alekfal authored Mar 19, 2024
2 parents a915fdb + dd0d2a9 commit ae6688a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
1 change: 0 additions & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,5 @@ dev = [
"pytest",
"pytest-cov",
"pytest-dependency",
"pytest-lazy-fixture",
"pytest-mock",
]
47 changes: 24 additions & 23 deletions tests/test_get_data.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import pytest
import geopandas as gpd
from shapely.geometry import Point, Polygon, MultiPolygon
Expand Down Expand Up @@ -65,25 +66,25 @@
gbbox_invalid_lat = bbox(20., 22.1, 37., 37.1, "EPSG:4326")

params = [
(gpoint, start, end, True, "./data", "ag", [], "random", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "random", [], "hourly", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "ag", [], "hourly", "random", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "ag", [], "hourly", "point", "random", pytest.raises(ValueError)),
(gbbox, start, end, True, "./data", "ag", [], "hourly", "regional", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "ag", r_params, "hourly", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "ag", r_params, "daily", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "ag", r_params, "monthly", "point", "csv", pytest.raises(ValueError)),
(wrong_geom, start, end, True, "./data", "ag", [], "monthly", "point", "csv", pytest.raises(TypeError)),
(gdf_two_points, start, end, True, "./data", "ag", [], "monthly", "point", "csv", pytest.raises(ValueError)),
(multipolygon, start, end, True, "./data", "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),
(gbbox, start, end, True, "./data", "ag", [], "monthly", "point", "csv", pytest.raises(ValueError)),
(gpoint, wrong_start_date_format, end, True, "./data", "ag", [], "monthly", "point", "csv", pytest.raises(TypeError)),
(gpoint, start, wrong_end_date_format, True, "./data", "ag", [], "monthly", "point", "csv", pytest.raises(TypeError)),
(gpoint, start_later, end_later, True, "./data", "ag", [], "monthly", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, "./data", "ag", [], "climatology", "point", "csv", pytest.raises(ValueError)),
(gbbox_invalid_lon, start, end, True, "./data", "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),
(gbbox_invalid_lat, start, end, True, "./data", "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "random", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "random", [], "hourly", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "hourly", "random", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "hourly", "point", "random", pytest.raises(ValueError)),
(gbbox, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "hourly", "regional", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", r_params, "hourly", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", r_params, "daily", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", r_params, "monthly", "point", "csv", pytest.raises(ValueError)),
(wrong_geom, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "point", "csv", pytest.raises(TypeError)),
(gdf_two_points, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "point", "csv", pytest.raises(ValueError)),
(multipolygon, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),
(gbbox, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "point", "csv", pytest.raises(ValueError)),
(gpoint, wrong_start_date_format, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "point", "csv", pytest.raises(TypeError)),
(gpoint, start, wrong_end_date_format, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "point", "csv", pytest.raises(TypeError)),
(gpoint, start_later, end_later, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "point", "csv", pytest.raises(ValueError)),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "climatology", "point", "csv", pytest.raises(ValueError)),
(gbbox_invalid_lon, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),
(gbbox_invalid_lat, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "regional", "csv", pytest.raises(ValueError)),

]

Expand All @@ -98,8 +99,8 @@ def test_get_data_invalid(geometry, start, end, to_file, path, community, parame
end_climatology = datetime.date(2022, 1, 1)

params_valid_csv = [
(gpoint, start, end, True, "./data", "ag", [], "daily", "point", "csv"),
(gpoint, start, end, True, "./data", "ag", [], "daily", "point", "ascii"),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "daily", "point", "csv"),
(gpoint, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "daily", "point", "ascii"),
]

@pytest.mark.parametrize("geometry, start, end, to_file, path, community, parameters, temporal_api, spatial_api, format", params_valid_csv,)
Expand All @@ -108,7 +109,7 @@ def test_get_data_valid_csv(geometry, start, end, to_file, path, community, para
assert isinstance(result, pd.DataFrame)

params_valid_netcdf = [
(gbbox, start, end, True, "./data", "ag", [], "monthly", "regional", "netcdf"),
(gbbox, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "regional", "netcdf"),
]

@pytest.mark.parametrize("geometry, start, end, to_file, path, community, parameters, temporal_api, spatial_api, format", params_valid_netcdf,)
Expand All @@ -117,7 +118,7 @@ def test_get_data_valid_netcdf(geometry, start, end, to_file, path, community, p
assert isinstance(result, xr.Dataset)

params_valid_json = [
(gbbox, start, end, True, "./data", "ag", [], "monthly", "regional", "json"),
(gbbox, start, end, True, os.path.join(os.path.dirname(__file__), "data"), "ag", [], "monthly", "regional", "json"),
]

@pytest.mark.parametrize("geometry, start, end, to_file, path, community, parameters, temporal_api, spatial_api, format", params_valid_json,)
Expand Down

0 comments on commit ae6688a

Please sign in to comment.