Skip to content

Commit f7d65cd

Browse files
committed
Check to see if we have shimmed version too
1 parent db89eec commit f7d65cd

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

jupyter_server/prometheus/metrics.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
"""
77

88
from prometheus_client import Gauge, Histogram, Info
9+
from jupyter_server._version import version_info as server_version_info
910

1011
try:
1112
from notebook._version import version_info as notebook_version_info
1213
except ImportError:
1314
notebook_version_info = None
1415

1516

16-
if notebook_version_info is not None and notebook_version_info < (7,):
17+
if notebook_version_info is not None and notebook_version_info < (7,) and notebook_version_info != server_version_info:
1718
print("yes, we think we have an unshimmed notebook package")
1819
print(notebook_version_info)
1920
# Jupyter Notebook v6 also defined these metrics. Re-defining them results in a ValueError,

0 commit comments

Comments
 (0)