diff --git a/brian_dashboard_manager/config.py b/brian_dashboard_manager/config.py index 19fd6c836997d142dbe928dedcd313bc6ba474af..7e215f8bfc2c472aec99e0d6aaad787639974099 100644 --- a/brian_dashboard_manager/config.py +++ b/brian_dashboard_manager/config.py @@ -150,8 +150,6 @@ DEFAULT_ORGANIZATIONS = [ ] CONFIG_SCHEMA = { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { "influx-datasource": { "type": "object", diff --git a/brian_dashboard_manager/environment.py b/brian_dashboard_manager/environment.py index 865f17a9398f932ad788947da0a3e1640d904c55..05804f27fa994c79866b08717e2d82b8cc0c9f86 100644 --- a/brian_dashboard_manager/environment.py +++ b/brian_dashboard_manager/environment.py @@ -1,7 +1,7 @@ import json import logging.config import os -import pkg_resources +from importlib.metadata import distribution import sentry_sdk from sentry_sdk.integrations.flask import FlaskIntegration @@ -16,13 +16,12 @@ def setup_logging(): default_filename = os.path.join( os.path.dirname(__file__), 'logging_default_config.json') filename = os.getenv('LOGGING_CONFIG', default_filename) - sentry_dsn = os.getenv('SENTRY_DSN') if sentry_dsn: sentry_sdk.init( dsn=sentry_dsn, integrations=[FlaskIntegration()], - release=pkg_resources.get_distribution('brian-dashboard-manager').version) + release=distribution('brian-dashboard-manager').version) with open(filename) as f: # TODO: this mac workaround should be removed ... diff --git a/brian_dashboard_manager/inventory_provider/interfaces.py b/brian_dashboard_manager/inventory_provider/interfaces.py index 7a74d987b4601a87dd7588f722dd6cc3c4dc2f9a..44951bcba912970d44bc367f94b179354bab7ab9 100644 --- a/brian_dashboard_manager/inventory_provider/interfaces.py +++ b/brian_dashboard_manager/inventory_provider/interfaces.py @@ -62,7 +62,6 @@ _PORT_TYPES = [t.name for t in list(PORT_TYPES)] _INTERFACE_TYPES = [i.name for i in list(INTERFACE_TYPES)] ROUTER_INTERFACES_SCHEMA = { - "$schema": "http://json-schema.org/draft-07/schema#", "type": "array", "items": { "type": "object", @@ -89,8 +88,6 @@ ROUTER_INTERFACES_SCHEMA = { } INTERFACE_LIST_SCHEMA = { - '$schema': 'http://json-schema.org/draft-07/schema#', - 'definitions': { 'service': { 'type': 'object', @@ -137,8 +134,6 @@ INTERFACE_LIST_SCHEMA = { } GWS_DIRECT_DATA_SCHEMA = { - '$schema': 'http://json-schema.org/draft-07/schema#', - 'definitions': { 'oid': { 'type': 'string', @@ -214,8 +209,6 @@ GWS_DIRECT_DATA_SCHEMA = { } MULTICAST_SUBSCRIPTION_LIST_SCHEMA = { - '$schema': 'http://json-schema.org/draft-07/schema#', - 'definitions': { 'ipv4-address': { 'type': 'string', @@ -243,7 +236,6 @@ MULTICAST_SUBSCRIPTION_LIST_SCHEMA = { } NREN_REGION_LIST_SCHEMA = { - '$schema': 'https://json-schema.org/draft-07/schema#', 'definitions': { 'nren_region': { 'type': 'object', diff --git a/brian_dashboard_manager/routes/update.py b/brian_dashboard_manager/routes/update.py index 4674d82c85041886e04c692e35cc8debe58c72b2..8a042dfbfba511e0bcb42bf2bd3aa55c3f7823b0 100644 --- a/brian_dashboard_manager/routes/update.py +++ b/brian_dashboard_manager/routes/update.py @@ -13,7 +13,6 @@ from brian_dashboard_manager.config import STATE_PATH routes = Blueprint("update", __name__) UPDATE_RESPONSE_SCHEMA = { - '$schema': 'http://json-schema.org/draft-07/schema#', 'type': 'object', 'properties': { 'message': { diff --git a/brian_dashboard_manager/routes/version.py b/brian_dashboard_manager/routes/version.py index 55d6a88ff1081fc2c3f29b73697ec4c2b6a2bfc7..26da9b5b37e9da5470dc56549b56abee624e25df 100644 --- a/brian_dashboard_manager/routes/version.py +++ b/brian_dashboard_manager/routes/version.py @@ -1,5 +1,4 @@ -import pkg_resources - +from importlib.metadata import distribution from flask import Blueprint, jsonify from brian_dashboard_manager.routes import common @@ -18,6 +17,6 @@ def version(): version_params = { 'api': API_VERSION, 'module': - pkg_resources.get_distribution('brian-dashboard-manager').version + distribution('brian-dashboard-manager').version } return jsonify(version_params)