feat: simplify nightly version management

By pulling the version suffix from tutor, we avoid git conflicts when
merging the release branch in nightly.
This commit is contained in:
Régis Behmo 2023-11-20 17:39:46 +01:00
parent 084318a5ef
commit 7dea2459a7
3 changed files with 6 additions and 8 deletions

View File

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

View File

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

View File

@ -7,9 +7,14 @@ import typing as t
import pkg_resources import pkg_resources
from tutor import hooks as tutor_hooks from tutor import hooks as tutor_hooks
from tutor.__about__ import __version_suffix__
from .__about__ import __version__ from .__about__ import __version__
# Handle version suffix in nightly mode, just like tutor core
if __version_suffix__:
__version__ += "-" + __version_suffix__
config = { config = {
"unique": {"OAUTH2_SECRET": "{{ 24|random_string }}"}, "unique": {"OAUTH2_SECRET": "{{ 24|random_string }}"},
"defaults": { "defaults": {