Skip to content

Commit

Permalink
Merge pull request #33 from tstoeter/main
Browse files Browse the repository at this point in the history
  • Loading branch information
joshmoore authored Dec 11, 2024
2 parents c7cd09f + be2805b commit 84cca5e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ requires-python = ">3.8"

dependencies = [
"omero-py>=5.8",
"entrypoints",
"types-entrypoints",
"importlib-metadata",
"future",
"rdflib",
"pyld",
Expand Down
5 changes: 3 additions & 2 deletions src/omero_rdf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from functools import wraps
from typing import Any, Callable, Dict, Generator, List, Optional, Set, Tuple, Union

import entrypoints
from importlib.metadata import entry_points
from omero.cli import BaseControl, Parser, ProxyStringType
from omero.gateway import BlitzGateway, BlitzObjectWrapper
from omero.model import Dataset, Image, IObject, Plate, Project, Screen
Expand Down Expand Up @@ -318,7 +318,8 @@ def descending(self):

def load_handlers(self) -> Handlers:
annotation_handlers: Handlers = []
for ep in entrypoints.get_group_all("omero_rdf.annotation_handler"):
eps = entry_points()
for ep in eps.get("omero_rdf.annotation_handler", []):
ah_loader = ep.load()
annotation_handlers.append(ah_loader(self))
# We know there are some built in handlers
Expand Down

0 comments on commit 84cca5e

Please sign in to comment.