Merge pull request #1921 from cmu-delphi/rzatserkovnyi/pkg-resources

Replace deprecated pkg_resources

Author: dshemetov

_delphi_utils_python/delphi_utils/geomap.py

@@ -3,12 +3,12 @@
 Authors: Dmitry Shemetov @dshemetov, James Sharpnack @jsharpna, Maria Jahja
 """
 
-from os.path import join
 from collections import defaultdict
+from os.path import join
 from typing import Iterator, List, Literal, Optional, Set, Union
 
+import importlib_resources
 import pandas as pd
-import pkg_resources
 from pandas.api.types import is_string_dtype
 
 
@@ -153,7 +153,7 @@ def __init__(self, census_year: int = 2020):
         for from_code, to_codes in self.CROSSWALK_FILENAMES.items():
             for to_code, file_path in to_codes.items():
                 self._crosswalks[from_code][to_code] = self._load_crosswalk_from_file(
-                    from_code, to_code, join(f"data/{census_year}", file_path)
+                    from_code, to_code, join("data", f"{census_year}", file_path)
                 )
 
         for geo_type in self._geos:
@@ -162,7 +162,7 @@ def __init__(self, census_year: int = 2020):
     def _load_crosswalk_from_file(
         self, from_code: str, to_code: str, data_path: str
     ) -> pd.DataFrame:
-        stream = pkg_resources.resource_stream(__name__, data_path)
+        stream = importlib_resources.files(__name__) / data_path
         dtype = {
             from_code: str,
             to_code: str,

_delphi_utils_python/setup.py

@@ -12,6 +12,7 @@
     "epiweeks",
     "freezegun",
     "gitpython",
+    "importlib_resources>=1.3",
     "mock",
     "moto~=4.2.14",
     "numpy",