diff --git a/plenoirf/__old_init__.py b/plenoirf/__old_init__.py index a732adb..bef63b6 100644 --- a/plenoirf/__old_init__.py +++ b/plenoirf/__old_init__.py @@ -26,7 +26,7 @@ import pandas as pd import tarfile import io -import pkg_resources +from importlib import resources as importlib_resources import json_utils import binning_utils @@ -352,9 +352,13 @@ def _estimate_trigger_geometry_of_plenoscope( tss = pl.trigger.geometry.init_summation_statistics( trigger_geometry=trigger_geometry ) - plenopy_trigger_script_plot_path = pkg_resources.resource_filename( - "plenopy", os.path.join("trigger", "scripts", "plot.py") + plenopy_trigger_script_plot_path = os.path.join( + importlib_resources.files("plenopy"), + "trigger", + "scripts", + "plot.py", ) + try: logger.info("plotting trigger-geometry") subprocess.call( diff --git a/plenoirf/summary/__init__.py b/plenoirf/summary/__init__.py index 90a0121..2432224 100644 --- a/plenoirf/summary/__init__.py +++ b/plenoirf/summary/__init__.py @@ -3,7 +3,7 @@ from os.path import join as opj import pandas import numpy as np -import pkg_resources +from importlib import resources as importlib_resources import subprocess import sparse_numeric_table as spt import glob @@ -124,8 +124,8 @@ def run(run_dir): def _make_script_abspaths(): - script_absdir = pkg_resources.resource_filename( - "plenoirf", os.path.join("summary", "scripts") + script_absdir = os.path.join( + importlib_resources.files("plenoirf"), "summary", "scripts" ) _paths = glob.glob(os.path.join(script_absdir, "*")) out = [] diff --git a/plenoirf/summary/scripts/0544_diffsens_estimate_fermi_lat.py b/plenoirf/summary/scripts/0544_diffsens_estimate_fermi_lat.py index 0ea74ee..d02169b 100644 --- a/plenoirf/summary/scripts/0544_diffsens_estimate_fermi_lat.py +++ b/plenoirf/summary/scripts/0544_diffsens_estimate_fermi_lat.py @@ -4,7 +4,6 @@ import numpy as np import json_utils import plenoirf as irf -import pkg_resources import binning_utils import os diff --git a/plenoirf/summary/scripts/0545_diffsens_estimate_cta_south.py b/plenoirf/summary/scripts/0545_diffsens_estimate_cta_south.py index 9761cee..9101145 100644 --- a/plenoirf/summary/scripts/0545_diffsens_estimate_cta_south.py +++ b/plenoirf/summary/scripts/0545_diffsens_estimate_cta_south.py @@ -4,7 +4,7 @@ import numpy as np import json_utils import plenoirf as irf -import pkg_resources +from importlib import resources as importlib_resources import binning_utils import os @@ -52,11 +52,12 @@ # instrument-response-function # ---------------------------- -cta_irf_path = pkg_resources.resource_filename( - "flux_sensitivity", - os.path.join( - "tests", "resources", "cta", CTA_IRF_CONFIG["name"] + ".fits.gz" - ), +cta_irf_path = os.path.join( + importlib_resources.files("flux_sensitivity"), + "tests", + "resources", + "cta", + CTA_IRF_CONFIG["name"] + ".fits.gz", ) cta_irf = ( diff --git a/plenoirf/summary/scripts/1005_plot_light_field_geometry.py b/plenoirf/summary/scripts/1005_plot_light_field_geometry.py index 6d2b8a5..d9438c9 100644 --- a/plenoirf/summary/scripts/1005_plot_light_field_geometry.py +++ b/plenoirf/summary/scripts/1005_plot_light_field_geometry.py @@ -2,16 +2,18 @@ import sys import plenoirf as irf import os -import pkg_resources +from importlib import resources as importlib_resources import subprocess argv = irf.summary.argv_since_py(sys.argv) pa = irf.summary.paths_from_argv(argv) -script_path = pkg_resources.resource_filename( - "plenoptics", - os.path.join("scripts", "plot_beams_statistics.py"), +script_path = os.path.join( + importlib_resources.files("plenoptics"), + "scripts", + "plot_beams_statistics.py", ) + subprocess.call( [ "python", diff --git a/plenoirf/summary/scripts_multiprocessing.py b/plenoirf/summary/scripts_multiprocessing.py index 7d60c72..09246a7 100644 --- a/plenoirf/summary/scripts_multiprocessing.py +++ b/plenoirf/summary/scripts_multiprocessing.py @@ -1,4 +1,4 @@ -import pkg_resources +from importlib import resources as importlib_resources import os import glob import subprocess @@ -70,8 +70,8 @@ def run_parallel(run_dir, num_threads=6, polling_interval=1): out_dict=provenance.make_provenance(), ) - script_dir = pkg_resources.resource_filename( - "plenoirf", os.path.join("summary", "scripts") + script_dir = os.path.join( + importlib_resources.files("plenoirf"), "summary", "scripts" ) script_names = find_script_names(script_dir=script_dir) diff --git a/plenoirf/version.py b/plenoirf/version.py index 5c4105c..7863915 100644 --- a/plenoirf/version.py +++ b/plenoirf/version.py @@ -1 +1 @@ -__version__ = "1.0.1" +__version__ = "1.0.2"