Skip to content

Commit

Permalink
switch to new importlib.metadata API
Browse files Browse the repository at this point in the history
  • Loading branch information
Helveg committed Aug 29, 2023
1 parent 8c8924c commit 7cf0383
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions glia/_glia.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import os, sys, pkg_resources, json, subprocess
import os, sys, json, subprocess
import weakref
from importlib.metadata import entry_points
from shutil import copy2 as copy_file, rmtree as rmdir
from functools import wraps
from ._hash import get_directory_hash, hash_path
Expand Down Expand Up @@ -80,14 +81,14 @@ def discover_packages(self):
from .assets import Package

self._packages = []
for pkg_ptr in pkg_resources.iter_entry_points("glia.package"):
for pkg_ptr in entry_points().get("glia.package", []):
advert = pkg_ptr.load()
self.entry_points.append(advert)
self._packages.append(Package.from_remote(self, advert))

def discover_catalogues(self):
self._catalogues = {}
for pkg_ptr in pkg_resources.iter_entry_points("glia.catalogue"):
for pkg_ptr in entry_points().get("glia.catalogue", []):
advert = pkg_ptr.load()
self.entry_points.append(advert)
if advert.name in self._catalogues:
Expand Down

0 comments on commit 7cf0383

Please sign in to comment.