Skip to content

Commit 9c57c99

Browse files
authored
MSYS2 bootstrapper (#332)
* Added API endpoints to pass files from the MSYS2 repos to the client MSYS2 terminals * Updated documentation to reflect addition of MSYS2 support * Updated documentation with 'virtualenv' and 'murfey' installation instructions
1 parent 70f5b4a commit 9c57c99

File tree

6 files changed

+618
-199
lines changed

6 files changed

+618
-199
lines changed

src/murfey/server/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383

8484

8585
class ExtendedRecord(NamedTuple):
86-
record: Base
87-
record_params: List[Base]
86+
record: Base # type: ignore
87+
record_params: List[Base] # type: ignore
8888

8989

9090
class JobIDs(NamedTuple):
@@ -2852,8 +2852,8 @@ def _register(record, header: dict, **kwargs):
28522852
raise NotImplementedError(f"Not method to register {record} or type {type(record)}")
28532853

28542854

2855-
@_register.register # type: ignore
2856-
def _(record: Base, header: dict, **kwargs):
2855+
@_register.register
2856+
def _(record: Base, header: dict, **kwargs): # type: ignore
28572857
if not _transport_object:
28582858
logger.error(
28592859
f"No transport object found when processing record {record}. Message header: {header}"
@@ -2891,7 +2891,7 @@ def _(record: Base, header: dict, **kwargs):
28912891
return None
28922892

28932893

2894-
@_register.register # type: ignore
2894+
@_register.register
28952895
def _(extended_record: ExtendedRecord, header: dict, **kwargs):
28962896
if not _transport_object:
28972897
raise ValueError(

src/murfey/server/api/auth.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import annotations
22

3-
import importlib.metadata
43
import secrets
4+
import sys
55
from logging import getLogger
66
from typing import Annotated, Dict
77

@@ -17,6 +17,11 @@
1717
from murfey.util.db import MurfeyUser as User
1818
from murfey.util.db import Session as MurfeySession
1919

20+
if sys.version_info < (3, 10):
21+
from importlib_metadata import entry_points
22+
else:
23+
from importlib.metadata import entry_points
24+
2025
# Set up logger
2126
logger = getLogger("murfey.server.api.auth")
2227

@@ -64,7 +69,8 @@ def validate_user(username: str, password: str) -> bool:
6469

6570

6671
def validate_visit(visit_name: str, token: str) -> bool:
67-
if validators := importlib.metadata.entry_points().select(
72+
# Entry points have to be handled differently pre-3.9
73+
if validators := entry_points().select(
6874
group="murfey.auth.session_validation",
6975
name=machine_config.auth.session_validation,
7076
):

0 commit comments

Comments
 (0)