From 411a601ba9eca4b233eb74434d9287457bc2389b 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 +- tutordiscovery/__about__.py | 7 ------- tutordiscovery/plugin.py | 5 +++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index f0ff238..128377a 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ with io.open( setup( name="tutor-discovery", - version=about["__package_version__"], + version=about["__version__"], url="https://docs.tutor.overhang.io/", project_urls={ "Documentation": "https://docs.tutor.overhang.io/", diff --git a/tutordiscovery/__about__.py b/tutordiscovery/__about__.py index d1f60af..d945113 100644 --- a/tutordiscovery/__about__.py +++ b/tutordiscovery/__about__.py @@ -1,9 +1,2 @@ __version__ = "16.0.1" -__package_version__ = __version__ - -# Handle version suffix for nightly, just like tutor core. -__version_suffix__ = "" - -if __version_suffix__: - __version__ += "-" + __version_suffix__ diff --git a/tutordiscovery/plugin.py b/tutordiscovery/plugin.py index 3e36638..9f964ff 100644 --- a/tutordiscovery/plugin.py +++ b/tutordiscovery/plugin.py @@ -6,9 +6,14 @@ import pkg_resources 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__ + HERE = os.path.abspath(os.path.dirname(__file__))