From 7dea2459a79318855780c7339af5d4909127e144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Mon, 20 Nov 2023 17:39:46 +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 +-
 tutorandroid/__about__.py | 7 -------
 tutorandroid/plugin.py    | 5 +++++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index b0b4da1..512da5f 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def load_about():
 
 setup(
     name="tutor-android",
-    version=ABOUT["__package_version__"],
+    version=ABOUT["__version__"],
     url="https://github.com/overhangio/tutor-android",
     project_urls={
         "Code": "https://github.com/overhangio/tutor-android",
diff --git a/tutorandroid/__about__.py b/tutorandroid/__about__.py
index 6d477ab..1722f39 100644
--- a/tutorandroid/__about__.py
+++ b/tutorandroid/__about__.py
@@ -1,9 +1,2 @@
 __version__ = "16.0.0"
-__package_version__ = __version__
-
-# Handle version suffix for nightly, just like tutor core.
-__version_suffix__ = ""
-
-if __version_suffix__:
-    __version__ += "-" + __version_suffix__
 
diff --git a/tutorandroid/plugin.py b/tutorandroid/plugin.py
index e044aa6..8d0d92f 100644
--- a/tutorandroid/plugin.py
+++ b/tutorandroid/plugin.py
@@ -7,9 +7,14 @@
 import pkg_resources
 
 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__
+
 config = {
     "unique": {"OAUTH2_SECRET": "{{ 24|random_string }}"},
     "defaults": {