Skip to content

Commit 40029a7

Browse files
committed
More clearly specify how we look for v6 notebook packages
1 parent f7d65cd commit 40029a7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

jupyter_server/prometheus/metrics.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@
1010

1111
try:
1212
from notebook._version import version_info as notebook_version_info
13+
v6_notebook_present = notebook_version_info != server_version_info
1314
except ImportError:
14-
notebook_version_info = None
15+
# notebook._version is not present, so notebook v6 can not be present
16+
v6_notebook_present = False
1517

1618

17-
if notebook_version_info is not None and notebook_version_info < (7,) and notebook_version_info != server_version_info:
19+
if v6_notebook_present:
1820
print("yes, we think we have an unshimmed notebook package")
1921
print(notebook_version_info)
22+
print(server_version_info)
2023
# Jupyter Notebook v6 also defined these metrics. Re-defining them results in a ValueError,
2124
# so we simply re-export them if we are co-existing with the notebook v6 package.
2225
# See https://github.com/jupyter/jupyter_server/issues/209

0 commit comments

Comments
 (0)