Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
brian-dashboard-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
geant-swd
brian
brian-dashboard-manager
Commits
f7810526
Commit
f7810526
authored
7 months ago
by
Bjarke Madsen
Browse files
Options
Downloads
Patches
Plain Diff
Fix use of importlib that doesn't work for python 3.6
parent
75871578
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
brian_dashboard_manager/environment.py
+6
-2
6 additions, 2 deletions
brian_dashboard_manager/environment.py
brian_dashboard_manager/routes/version.py
+6
-2
6 additions, 2 deletions
brian_dashboard_manager/routes/version.py
with
12 additions
and
4 deletions
brian_dashboard_manager/environment.py
+
6
−
2
View file @
f7810526
import
json
import
json
import
logging.config
import
logging.config
import
os
import
os
from
importlib.metadata
import
distribution
import
sentry_sdk
import
sentry_sdk
from
sentry_sdk.integrations.flask
import
FlaskIntegration
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
():
def
setup_logging
():
"""
"""
...
@@ -21,7 +25,7 @@ def setup_logging():
...
@@ -21,7 +25,7 @@ def setup_logging():
sentry_sdk
.
init
(
sentry_sdk
.
init
(
dsn
=
sentry_dsn
,
dsn
=
sentry_dsn
,
integrations
=
[
FlaskIntegration
()],
integrations
=
[
FlaskIntegration
()],
release
=
distribution
(
'
brian-dashboard-manager
'
).
version
)
release
=
get_
distribution
(
'
brian-dashboard-manager
'
).
version
)
with
open
(
filename
)
as
f
:
with
open
(
filename
)
as
f
:
# TODO: this mac workaround should be removed ...
# TODO: this mac workaround should be removed ...
...
...
This diff is collapsed.
Click to expand it.
brian_dashboard_manager/routes/version.py
+
6
−
2
View file @
f7810526
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
flask
import
Blueprint
,
jsonify
from
brian_dashboard_manager.routes
import
common
from
brian_dashboard_manager.routes
import
common
...
@@ -17,6 +21,6 @@ def version():
...
@@ -17,6 +21,6 @@ def version():
version_params
=
{
version_params
=
{
'
api
'
:
API_VERSION
,
'
api
'
:
API_VERSION
,
'
module
'
:
'
module
'
:
distribution
(
'
brian-dashboard-manager
'
).
version
get_
distribution
(
'
brian-dashboard-manager
'
).
version
}
}
return
jsonify
(
version_params
)
return
jsonify
(
version_params
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment