diff --git a/activitysim/abm/test/test_misc/setup_utils.py b/activitysim/abm/test/test_misc/setup_utils.py index a4fe7e9c06..7169404432 100644 --- a/activitysim/abm/test/test_misc/setup_utils.py +++ b/activitysim/abm/test/test_misc/setup_utils.py @@ -2,6 +2,7 @@ # See full license in LICENSE.txt. from __future__ import annotations +import importlib.resources import logging import os @@ -10,7 +11,6 @@ import openmatrix as omx import pandas as pd import pandas.testing as pdt -import pkg_resources import pytest import yaml @@ -32,7 +32,7 @@ def example_path(dirname): resource = os.path.join("examples", "prototype_mtc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def setup_dirs(ancillary_configs_dir=None, data_dir=None): diff --git a/activitysim/abm/test/test_misc/test_load_cached_accessibility.py b/activitysim/abm/test/test_misc/test_load_cached_accessibility.py index 60288d67c8..402b18783a 100644 --- a/activitysim/abm/test/test_misc/test_load_cached_accessibility.py +++ b/activitysim/abm/test/test_misc/test_load_cached_accessibility.py @@ -2,6 +2,7 @@ # See full license in LICENSE.txt. from __future__ import annotations +import importlib.resources import logging import os @@ -10,7 +11,6 @@ import openmatrix as omx import pandas as pd import pandas.testing as pdt -import pkg_resources import pytest import yaml @@ -34,7 +34,7 @@ def example_path(dirname): resource = os.path.join("examples", "prototype_mtc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def close_handlers(): diff --git a/activitysim/abm/test/test_pipeline/test_pipeline.py b/activitysim/abm/test/test_pipeline/test_pipeline.py index b245e97f5e..2d837258a5 100644 --- a/activitysim/abm/test/test_pipeline/test_pipeline.py +++ b/activitysim/abm/test/test_pipeline/test_pipeline.py @@ -2,6 +2,7 @@ # See full license in LICENSE.txt. from __future__ import annotations +import importlib.resources import logging import os @@ -9,7 +10,6 @@ import openmatrix as omx import pandas as pd import pandas.testing as pdt -import pkg_resources import pytest from activitysim.core import random, tracing, workflow @@ -34,7 +34,7 @@ def example_path(dirname): resource = os.path.join("examples", "prototype_mtc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def setup_dirs(ancillary_configs_dir=None, data_dir=None): diff --git a/activitysim/cli/create.py b/activitysim/cli/create.py index 4275ad3a1d..ec2e917bd8 100644 --- a/activitysim/cli/create.py +++ b/activitysim/cli/create.py @@ -11,7 +11,6 @@ import zipfile from pathlib import Path -import pkg_resources import requests import yaml diff --git a/activitysim/examples/placeholder_multiple_zone/test/test_multiple_zone.py b/activitysim/examples/placeholder_multiple_zone/test/test_multiple_zone.py index 46aa8bf466..3e956301e9 100644 --- a/activitysim/examples/placeholder_multiple_zone/test/test_multiple_zone.py +++ b/activitysim/examples/placeholder_multiple_zone/test/test_multiple_zone.py @@ -2,13 +2,13 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess import sys from pathlib import Path import pandas as pd -import pkg_resources import pytest from activitysim.core import test, workflow @@ -16,12 +16,12 @@ def example_path(dirname): resource = os.path.join("examples", "placeholder_multiple_zone", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def mtc_example_path(dirname): resource = os.path.join("examples", "prototype_mtc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def build_data(): diff --git a/activitysim/examples/production_semcog/test/test_semcog.py b/activitysim/examples/production_semcog/test/test_semcog.py index 10651d4453..e247fd6451 100644 --- a/activitysim/examples/production_semcog/test/test_semcog.py +++ b/activitysim/examples/production_semcog/test/test_semcog.py @@ -2,11 +2,11 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess import pandas as pd -import pkg_resources from activitysim.core.test._tools import assert_frame_substantively_equal @@ -14,7 +14,7 @@ def run_test_semcog(multiprocess=False): def example_path(dirname): resource = os.path.join("examples", "production_semcog", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def test_path(dirname): return os.path.join(os.path.dirname(__file__), dirname) diff --git a/activitysim/examples/prototype_arc/test/test_arc.py b/activitysim/examples/prototype_arc/test/test_arc.py index 54462ec958..3e637289c5 100644 --- a/activitysim/examples/prototype_arc/test/test_arc.py +++ b/activitysim/examples/prototype_arc/test/test_arc.py @@ -2,13 +2,13 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess import sys import pandas as pd import pandas.testing as pdt -import pkg_resources from activitysim.core.test import assert_frame_substantively_equal @@ -16,7 +16,7 @@ def _test_arc(recode=False, sharrow=False): def example_path(dirname): resource = os.path.join("examples", "prototype_arc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def test_path(dirname): return os.path.join(os.path.dirname(__file__), dirname) diff --git a/activitysim/examples/prototype_marin/test/test_marin.py b/activitysim/examples/prototype_marin/test/test_marin.py index 4de5028f19..11f5cd88f1 100644 --- a/activitysim/examples/prototype_marin/test/test_marin.py +++ b/activitysim/examples/prototype_marin/test/test_marin.py @@ -2,20 +2,20 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess from pathlib import Path import pandas as pd import pandas.testing as pdt -import pkg_resources from activitysim.core import test, workflow def example_path(dirname): resource = os.path.join("examples", "prototype_marin", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def _test_path(dirname): diff --git a/activitysim/examples/prototype_mtc/test/test_mtc.py b/activitysim/examples/prototype_mtc/test/test_mtc.py index b72ac5c495..06878f4f85 100644 --- a/activitysim/examples/prototype_mtc/test/test_mtc.py +++ b/activitysim/examples/prototype_mtc/test/test_mtc.py @@ -2,6 +2,7 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess import sys @@ -9,7 +10,6 @@ import pandas as pd import pandas.testing as pdt -import pkg_resources from activitysim.core import test, workflow @@ -17,7 +17,7 @@ def run_test_mtc(multiprocess=False, chunkless=False, recode=False, sharrow=False): def example_path(dirname): resource = os.path.join("examples", "prototype_mtc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def test_path(dirname): return os.path.join(os.path.dirname(__file__), dirname) diff --git a/activitysim/examples/prototype_mtc_extended/sampling_scenarios.py b/activitysim/examples/prototype_mtc_extended/sampling_scenarios.py index f718f4745d..ed6e352c48 100644 --- a/activitysim/examples/prototype_mtc_extended/sampling_scenarios.py +++ b/activitysim/examples/prototype_mtc_extended/sampling_scenarios.py @@ -1,11 +1,11 @@ from __future__ import annotations import argparse +import importlib.resources import os import shutil import pandas as pd -import pkg_resources import yaml from activitysim.cli.run import add_run_args, run @@ -35,12 +35,12 @@ def integer_params(params): def base_path(dirname): resource = os.path.join("examples", "placeholder_sandag_2_zone", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def extended_path(dirname): resource = os.path.join("examples", "placeholder_sandag_2_zone_extended", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def run_model(): diff --git a/activitysim/examples/prototype_mtc_extended/test/test_mtc_extended.py b/activitysim/examples/prototype_mtc_extended/test/test_mtc_extended.py index f78b7f8b99..ae74051737 100644 --- a/activitysim/examples/prototype_mtc_extended/test/test_mtc_extended.py +++ b/activitysim/examples/prototype_mtc_extended/test/test_mtc_extended.py @@ -2,6 +2,7 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess import sys @@ -9,7 +10,6 @@ import pandas as pd import pandas.testing as pdt -import pkg_resources import pytest from activitysim.core import configuration, test, workflow @@ -23,11 +23,11 @@ def _test_prototype_mtc_extended( ): def example_path(dirname): resource = os.path.join("examples", "prototype_mtc_extended", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def example_mtc_path(dirname): resource = os.path.join("examples", "prototype_mtc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def test_path(dirname): return os.path.join(os.path.dirname(__file__), dirname) diff --git a/activitysim/examples/prototype_mwcog/test/test_mwcog.py b/activitysim/examples/prototype_mwcog/test/test_mwcog.py index 8978d269d0..9bc6cae753 100644 --- a/activitysim/examples/prototype_mwcog/test/test_mwcog.py +++ b/activitysim/examples/prototype_mwcog/test/test_mwcog.py @@ -2,13 +2,13 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess import sys import pandas as pd import pandas.testing as pdt -import pkg_resources from activitysim.core import test @@ -16,7 +16,7 @@ def _test_mwcog(sharrow=False): def example_path(dirname): resource = os.path.join("examples", "prototype_mwcog", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def test_path(dirname): return os.path.join(os.path.dirname(__file__), dirname) diff --git a/activitysim/examples/prototype_sandag_xborder/test/test_sandag_xborder.py b/activitysim/examples/prototype_sandag_xborder/test/test_sandag_xborder.py index e9d538cde8..608e430763 100644 --- a/activitysim/examples/prototype_sandag_xborder/test/test_sandag_xborder.py +++ b/activitysim/examples/prototype_sandag_xborder/test/test_sandag_xborder.py @@ -2,6 +2,7 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess import sys @@ -9,7 +10,6 @@ import pandas as pd import pandas.testing as pdt -import pkg_resources from activitysim.core import workflow from activitysim.core.test import run_if_exists @@ -18,7 +18,7 @@ def _test_sandag_xborder(sharrow=False, mp=True): def example_path(dirname): resource = os.path.join("examples", "prototype_sandag_xborder", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def test_path(dirname): return os.path.join(os.path.dirname(__file__), dirname) diff --git a/test/random_seed/test_random_seed.py b/test/random_seed/test_random_seed.py index 6f4997f62d..d9a33f2bf1 100644 --- a/test/random_seed/test_random_seed.py +++ b/test/random_seed/test_random_seed.py @@ -2,13 +2,13 @@ # ActivitySim # See full license in LICENSE.txt. +import importlib.resources import os import subprocess from shutil import copytree import pandas as pd import pandas.testing as pdt -import pkg_resources import yaml @@ -35,7 +35,7 @@ def run_test_random_seed(): def example_path(dirname): resource = os.path.join("examples", "prototype_mtc", dirname) - return pkg_resources.resource_filename("activitysim", resource) + return str(importlib.resources.files("activitysim").joinpath(resource)) def test_path(dirname): return os.path.join(os.path.dirname(__file__), dirname)