Merge branch 'master' into nightly

overhangio · Nov 20, 2023 · a065a93 · a065a93
2 parents b2f97d0 + 5eceee6
commit a065a93
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="tutor-ecommerce",
-    version=about["__package_version__"],
+    version=about["__version__"],
     url="https://docs.tutor.overhang.io/",
     project_urls={
         "Documentation": "https://docs.tutor.overhang.io/",

diff --git a/tutorecommerce/__about__.py b/tutorecommerce/__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__
 
diff --git a/tutorecommerce/plugin.py b/tutorecommerce/plugin.py
@@ -7,10 +7,15 @@
 import pkg_resources
 
 from tutor import hooks as tutor_hooks
+from tutor.__about__ import __version_suffix__
 from tutormfe.hooks import MFE_APPS, MFE_ATTRS_TYPE
 
 from .__about__ import __version__
 
+# Handle version suffix in nightly mode, just like tutor core
+if __version_suffix__:
+    __version__ += "-" + __version_suffix__
+
 config = {
     "unique": {
         "MYSQL_PASSWORD": "{{ 8|random_string }}",