Merge branch 'master' into nightly

overhangio · Nov 20, 2023 · 04ff0e4 · 04ff0e4
2 parents bb45d80 + 998de5e
commit 04ff0e4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@ def load_about():
 
 setup(
     name="tutor-webui",
-    version=ABOUT["__package_version__"],
+    version=ABOUT["__version__"],
     url="https://overhang.io/overhangio/tutor-webui",
     project_urls={
         "Documentation": "https://docs.tutor.overhang.io/",

diff --git a/tutorwebui/__about__.py b/tutorwebui/__about__.py
@@ -1,9 +1,2 @@
 __version__ = "16.0.0"
-__package_version__ = __version__
-
-# Handle version suffix for nightly, just like tutor core.
-__version_suffix__ = "nightly"
-
-if __version_suffix__:
-    __version__ += "-" + __version_suffix__
 
diff --git a/tutorwebui/plugin.py b/tutorwebui/plugin.py
@@ -1,7 +1,12 @@
 from tutor import hooks as tutor_hooks
+from tutor.__about__ import __version_suffix__
 from .__about__ import __version__
 from . import cli
 
+# Handle version suffix in nightly mode, just like tutor core
+if __version_suffix__:
+    __version__ += "-" + __version_suffix__
+
 tutor_hooks.Filters.CLI_COMMANDS.add_items(
     [
         cli.shell,