Skip to content

Commit

Permalink
Replace deprecated pkg_resources
Browse files Browse the repository at this point in the history
  • Loading branch information
rzats committed Jan 4, 2024
1 parent c89e4d2 commit 4f71fef
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 17 deletions.
6 changes: 3 additions & 3 deletions Python-packages/covidcast-py/covidcast/covidcast.py
Expand Up @@ -8,7 +8,7 @@
import numpy as np
from delphi_epidata import Epidata
from delphi_epidata.delphi_epidata import _HEADERS
from pkg_resources import get_distribution, DistributionNotFound
from importlib.metadata import version, PackageNotFoundError
from epiweeks import Week

from .errors import NoDataWarning
Expand All @@ -18,8 +18,8 @@
Epidata.BASE_URL = "https://api.covidcast.cmu.edu/epidata"
# Prepend to Epidata client's user agent to specify this package and version
try:
_ver = get_distribution("covidcast").version
except DistributionNotFound:
_ver = version("covidcast")
except PackageNotFoundError:
_ver = "0.0.0"
_HEADERS['user-agent'] = f"covidcast/{_ver} " + _HEADERS['user-agent']

Expand Down
21 changes: 13 additions & 8 deletions Python-packages/covidcast-py/covidcast/geography.py
Expand Up @@ -4,14 +4,19 @@
from typing import Union, Iterable

import pandas as pd
import pkg_resources

COUNTY_CENSUS = pd.read_csv(
pkg_resources.resource_filename(__name__, "geo_mappings/county_census.csv"), dtype=str)
MSA_CENSUS = pd.read_csv(
pkg_resources.resource_filename(__name__, "geo_mappings/msa_census.csv"), dtype=str)
STATE_CENSUS = pd.read_csv(
pkg_resources.resource_filename(__name__, "geo_mappings/state_census.csv"), dtype=str)
import importlib_resources

county_census = importlib_resources.files(__name__) / 'geo_mappings' / 'county_census.csv'
with importlib_resources.as_file(county_census) as path:
COUNTY_CENSUS = pd.read_csv(path, dtype=str)

msa_census = importlib_resources.files(__name__) / 'geo_mappings' / 'msa_census.csv'
with importlib_resources.as_file(msa_census) as path:
MSA_CENSUS = pd.read_csv(path, dtype=str)

state_census = importlib_resources.files(__name__) / 'geo_mappings' / 'state_census.csv'
with importlib_resources.as_file(state_census) as path:
STATE_CENSUS = pd.read_csv(path, dtype=str)

# Filter undesired rows from CSVs.
# They're not removed from the files to keep them identical to rda files.
Expand Down
12 changes: 7 additions & 5 deletions Python-packages/covidcast-py/covidcast/plotting.py
Expand Up @@ -9,7 +9,7 @@
import imageio
import numpy as np
import pandas as pd
import pkg_resources
import importlib_resources
from matplotlib import pyplot as plt
from matplotlib import figure, axes
from tqdm import tqdm
Expand Down Expand Up @@ -182,8 +182,9 @@ def get_geo_df(data: pd.DataFrame,
raise ValueError("Unsupported geography type; "
"only `state`, `county`, `hrr`, and `msa` supported.")

shapefile_path = pkg_resources.resource_filename(__name__, SHAPEFILE_PATHS[geo_type])
geo_info = gpd.read_file(shapefile_path)
shapefile = importlib_resources.files(__name__) / SHAPEFILE_PATHS[geo_type]
with importlib_resources.as_file(shapefile) as shapefile_path:
geo_info = gpd.read_file(shapefile_path)

if geo_type == "state":
output = _join_state_geo_df(data, geo_value_col, geo_info, join_type)
Expand Down Expand Up @@ -294,8 +295,9 @@ def _plot_background_states(figsize: tuple) -> tuple:
"""
fig, ax = plt.subplots(1, figsize=figsize)
ax.axis("off")
state_shapefile_path = pkg_resources.resource_filename(__name__, SHAPEFILE_PATHS["state"])
state = gpd.read_file(state_shapefile_path)
state_shapefile = importlib_resources.files(__name__) / SHAPEFILE_PATHS["state"]
with importlib_resources.as_file(state_shapefile) as state_shapefile_path:
state = gpd.read_file(state_shapefile_path)
for state in _project_and_transform(state, "STATEFP"):
state.plot(color="0.9", ax=ax, edgecolor="0.8", linewidth=0.5)
ax.set_xlim(plt.xlim())
Expand Down
3 changes: 2 additions & 1 deletion Python-packages/covidcast-py/setup.py
Expand Up @@ -30,7 +30,8 @@
"imageio-ffmpeg",
"imageio",
"tqdm",
"epiweeks"
"epiweeks",
"importlib_resources==6.1.1",
],
package_data={"covidcast": ["shapefiles/*/*", "geo_mappings/*"]}
)

0 comments on commit 4f71fef

Please sign in to comment.