Skip to content

Commit

Permalink
feat: simplify nightly version management
Browse files Browse the repository at this point in the history
By pulling the version suffix from tutor, we avoid git conflicts when
merging the release branch in nightly.
  • Loading branch information
regisb committed Nov 20, 2023
1 parent 084318a commit 7dea245
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 0 additions & 7 deletions tutorandroid/__about__.py
Original file line number Diff line number Diff line change
@@ -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__

5 changes: 5 additions & 0 deletions tutorandroid/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 7dea245

Please sign in to comment.