From 6394227a160f3620f4a2b006fe5e2ab1aa6a38a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Mon, 20 Nov 2023 17:39:47 +0100 Subject: [PATCH] feat: simplify nightly version management By pulling the version suffix from tutor, we avoid git conflicts when merging the release branch in nightly. --- setup.py | 2 +- tutorcairn/__about__.py | 7 ------- tutorcairn/plugin.py | 5 +++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 071febc..99ffaff 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ ABOUT = load_about() setup( name="tutor-cairn", - version=ABOUT["__package_version__"], + version=ABOUT["__version__"], url="https://github.com/overhangio/tutor-cairn", project_urls={ "Code": "https://github.com/overhangio/tutor-cairn", diff --git a/tutorcairn/__about__.py b/tutorcairn/__about__.py index ae0505e..3e6531e 100644 --- a/tutorcairn/__about__.py +++ b/tutorcairn/__about__.py @@ -1,9 +1,2 @@ __version__ = "16.0.3" -__package_version__ = __version__ - -# Handle version suffix for nightly, just like tutor core. -__version_suffix__ = "" - -if __version_suffix__: - __version__ += "-" + __version_suffix__ diff --git a/tutorcairn/plugin.py b/tutorcairn/plugin.py index 9c9d81f..75a6291 100644 --- a/tutorcairn/plugin.py +++ b/tutorcairn/plugin.py @@ -8,9 +8,14 @@ import click import pkg_resources from tutor import hooks +from tutor.__about__ import __version_suffix__ from .__about__ import __version__ +# Handle version suffix in nightly mode, just like tutor core +if __version_suffix__: + __version__ += "-" + __version_suffix__ + HERE = os.path.abspath(os.path.dirname(__file__))