Merge branch 'master' into nightly

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/",

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

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__))