From fb58b889808bff1e8d28e0a462ae084f57fc4744 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 +- tutorcredentials/__about__.py | 7 ------- tutorcredentials/plugin.py | 5 +++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index a9153ff..9661fe0 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def load_about(): setup( name="tutor-credentials", - version=ABOUT["__package_version__"], + version=ABOUT["__version__"], url="https://github.com/overhangio/tutor-credentials.git", project_urls={ "Code": "https://github.com/overhangio/tutor-credentials.git", diff --git a/tutorcredentials/__about__.py b/tutorcredentials/__about__.py index 6a21c98..99e36f2 100644 --- a/tutorcredentials/__about__.py +++ b/tutorcredentials/__about__.py @@ -1,9 +1,2 @@ __version__ = "16.0.2" -__package_version__ = __version__ - -# Handle version suffix for nightly, just like tutor core. -__version_suffix__ = "" - -if __version_suffix__: - __version__ += "-" + __version_suffix__ diff --git a/tutorcredentials/plugin.py b/tutorcredentials/plugin.py index bdfa37e..c3174be 100644 --- a/tutorcredentials/plugin.py +++ b/tutorcredentials/plugin.py @@ -6,9 +6,14 @@ import typing as t from tutor import hooks as tutor_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__ + ######################################## # CONFIGURATION