Merge branch 'master' into nightly

setup.py

@@ -23,7 +23,7 @@ def load_about():
 
 setup(
     name="tutor-mfe",
-    version=ABOUT["__package_version__"],
+    version=ABOUT["__version__"],
     url="https://github.com/overhangio/tutor-mfe",
     project_urls={
         "Code": "https://github.com/overhangio/tutor-mfe",

tutormfe/__about__.py

@@ -1,9 +1,2 @@
 __version__ = "16.1.2"
-__package_version__ = __version__
 
-
-# Handle version suffix for nightly, just like tutor core.
-__version_suffix__ = "nightly"
-
-if __version_suffix__:
-    __version__ += "-" + __version_suffix__

tutormfe/plugin.py

@@ -6,13 +6,18 @@
 
 import pkg_resources
 from tutor import fmt
+from tutor.__about__ import __version_suffix__
 from tutor import hooks as tutor_hooks
 from tutor.hooks import priorities
 from tutor.types import Config, get_typed
 
-from .__about__ import __version__, __version_suffix__
+from .__about__ import __version__
 from .hooks import MFE_APPS, MFE_ATTRS_TYPE
 
+# Handle version suffix in nightly mode, just like tutor core
+if __version_suffix__:
+    __version__ += "-" + __version_suffix__
+
 config = {
     "defaults": {
         "VERSION": __version__,