Merge branch 'master' into nightly

setup.py

@@ -26,7 +26,7 @@ ABOUT = 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",

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__ = "nightly"
-
-if __version_suffix__:
-    __version__ += "-" + __version_suffix__
 

tutorandroid/plugin.py

@@ -7,9 +7,14 @@ import typing as t
 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": {