From 95b384201215726886b1bb7776ca94fff7164e66 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Thu, 24 Jul 2025 09:20:27 -0400 Subject: [PATCH] Removed runtime deps on pkg_resources --- src/momlevel/tidegauge.py | 6 +++--- tests/test_tidegauge.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/momlevel/tidegauge.py b/src/momlevel/tidegauge.py index b162a59..3aec20e 100644 --- a/src/momlevel/tidegauge.py +++ b/src/momlevel/tidegauge.py @@ -2,8 +2,8 @@ import os import pandas as pd -import pkg_resources as pkgr import xarray as xr +from importlib_resources import files from momlevel.util import geolocate_points from momlevel.util import tile_nominal_coords from momlevel.util import validate_tidegauge_data @@ -123,9 +123,9 @@ def extract_tidegauge( # Get pd.DataFrame of target locations. This DataFrame must contain columns # named `name`, `lat`, and `lon` if csv == "us": - csv = pkgr.resource_filename("momlevel", "resources/us_tide_gauges.csv") + csv = str(files("momlevel.resources") / "us_tide_gauges.csv") elif csv == "global": - csv = pkgr.resource_filename("momlevel", "resources/global_tide_gauges.csv") + csv = str(files("momlevel.resources") / "global_tide_gauges.csv") else: assert os.path.exists(csv) diff --git a/tests/test_tidegauge.py b/tests/test_tidegauge.py index 0769d54..5ceb596 100644 --- a/tests/test_tidegauge.py +++ b/tests/test_tidegauge.py @@ -1,12 +1,12 @@ """test_tidegauge.py - unit tests for tidegauge module""" -import pkg_resources as pkgr +from importlib_resources import files import xarray as xr import numpy as np from momlevel import tidegauge ds_nwa = xr.open_dataset( - pkgr.resource_filename("momlevel", "resources/NWA12_sample_grid_data.nc") + str(files("momlevel.resources") / "NWA12_sample_grid_data.nc") )