From f7810526f0405e44f173997647af16f054c3d23c Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Thu, 31 Oct 2024 10:02:07 +0100
Subject: [PATCH] Fix use of importlib that doesn't work for python 3.6
---
brian_dashboard_manager/environment.py | 8 ++++++--
brian_dashboard_manager/routes/version.py | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/brian_dashboard_manager/environment.py b/brian_dashboard_manager/environment.py
index 05804f2..9e10a69 100644
--- a/brian_dashboard_manager/environment.py
+++ b/brian_dashboard_manager/environment.py
@@ -1,10 +1,14 @@
import json
import logging.config
import os
-from importlib.metadata import distribution
import sentry_sdk
from sentry_sdk.integrations.flask import FlaskIntegration
+try:
+ from importlib.metadata import distribution as get_distribution
+except ImportError:
+ from pkg_resources import get_distribution
+
def setup_logging():
"""
@@ -21,7 +25,7 @@ def setup_logging():
sentry_sdk.init(
dsn=sentry_dsn,
integrations=[FlaskIntegration()],
- release=distribution('brian-dashboard-manager').version)
+ release=get_distribution('brian-dashboard-manager').version)
with open(filename) as f:
# TODO: this mac workaround should be removed ...
diff --git a/brian_dashboard_manager/routes/version.py b/brian_dashboard_manager/routes/version.py
index 26da9b5..59d97cb 100644
--- a/brian_dashboard_manager/routes/version.py
+++ b/brian_dashboard_manager/routes/version.py
@@ -1,4 +1,8 @@
-from importlib.metadata import distribution
+try:
+ from importlib.metadata import distribution as get_distribution
+except ImportError:
+ from pkg_resources import get_distribution
+
from flask import Blueprint, jsonify
from brian_dashboard_manager.routes import common
@@ -17,6 +21,6 @@ def version():
version_params = {
'api': API_VERSION,
'module':
- distribution('brian-dashboard-manager').version
+ get_distribution('brian-dashboard-manager').version
}
return jsonify(version_params)
--
GitLab