Skip to content

Commit

Permalink
replace depricated pkg_resources with importlib
Browse files Browse the repository at this point in the history
  • Loading branch information
relleums committed Feb 1, 2024
1 parent 463bb95 commit fee2500
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 21 deletions.
10 changes: 7 additions & 3 deletions plenoirf/__old_init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions plenoirf/summary/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import numpy as np
import json_utils
import plenoirf as irf
import pkg_resources
import binning_utils
import os

Expand Down
13 changes: 7 additions & 6 deletions plenoirf/summary/scripts/0545_diffsens_estimate_cta_south.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 = (
Expand Down
10 changes: 6 additions & 4 deletions plenoirf/summary/scripts/1005_plot_light_field_geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions plenoirf/summary/scripts_multiprocessing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import pkg_resources
from importlib import resources as importlib_resources
import os
import glob
import subprocess
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plenoirf/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

0 comments on commit fee2500

Please sign in to comment.