Skip to content

Commit 8103b62

Browse files
committed
Replaced 'entry_points' instances with those from 'backports.entry_points_selectable'; added comments to note when external entry points are being looked for
1 parent ba6e694 commit 8103b62

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/murfey/client/context.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from pathlib import Path
55
from typing import Any, Dict, List, NamedTuple
66

7-
import importlib_metadata
7+
from backports.entry_points_selectable import entry_points
88

99
from murfey.client.instance_environment import MurfeyInstanceEnvironment
1010

@@ -41,7 +41,8 @@ def __init__(self, name: str, acquisition_software: str):
4141
self.name = name
4242

4343
def post_transfer(self, transferred_file: Path, role: str = "", **kwargs):
44-
for h in importlib_metadata.entry_points(group="murfey.post_transfer_hooks"):
44+
# Search other packages in this environment for additional hooks to include in Murfey
45+
for h in entry_points(group="murfey.post_transfer_hooks"):
4546
if h.name == self.name:
4647
h.load()(transferred_file, role=role, **kwargs)
4748

src/murfey/server/main.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import logging
44
import os
5-
import sys
65

6+
from backports.entry_points_selectable import entry_points
77
from fastapi import FastAPI
88
from fastapi.middleware.cors import CORSMiddleware
99
from fastapi.staticfiles import StaticFiles
@@ -23,12 +23,6 @@
2323
from murfey.server import template_files
2424
from murfey.util.config import get_security_config
2525

26-
# Use importlib_metadata based on Python version
27-
if sys.version_info < (3, 10):
28-
from importlib_metadata import entry_points
29-
else:
30-
from importlib.metadata import entry_points
31-
3226
# Import Murfey server or demo server based on settings
3327
if os.getenv("MURFEY_DEMO"):
3428
from murfey.server.demo_api import router
@@ -82,5 +76,6 @@ class Settings(BaseSettings):
8276
app.include_router(murfey.server.api.hub.router)
8377
app.include_router(murfey.server.websocket.ws)
8478

79+
# Search other packages in this environment for additional routers to include in Murfey
8580
for r in entry_points(group="murfey.routers"):
8681
app.include_router(r.load())

0 commit comments

Comments
 (0)