Skip to content

Commit 998de5e

Browse files
committed
feat: simplify nightly version management
By pulling the version suffix from tutor, we avoid git conflicts when merging the release branch in nightly.
1 parent 653e09c commit 998de5e

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def load_about():
2626

2727
setup(
2828
name="tutor-webui",
29-
version=ABOUT["__package_version__"],
29+
version=ABOUT["__version__"],
3030
url="https://overhang.io/overhangio/tutor-webui",
3131
project_urls={
3232
"Documentation": "https://docs.tutor.overhang.io/",

tutorwebui/__about__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
11
__version__ = "16.0.0"
2-
__package_version__ = __version__
3-
4-
# Handle version suffix for nightly, just like tutor core.
5-
__version_suffix__ = ""
6-
7-
if __version_suffix__:
8-
__version__ += "-" + __version_suffix__
92

tutorwebui/plugin.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
from tutor import hooks as tutor_hooks
2+
from tutor.__about__ import __version_suffix__
23
from .__about__ import __version__
34
from . import cli
45

6+
# Handle version suffix in nightly mode, just like tutor core
7+
if __version_suffix__:
8+
__version__ += "-" + __version_suffix__
9+
510
tutor_hooks.Filters.CLI_COMMANDS.add_items(
611
[
712
cli.shell,

0 commit comments

Comments
 (0)