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:
parent
395a470a66
commit
fb58b88980
2
setup.py
2
setup.py
@ -26,7 +26,7 @@ ABOUT = load_about()
|
||||
|
||||
setup(
|
||||
name="tutor-credentials",
|
||||
version=ABOUT["__package_version__"],
|
||||
version=ABOUT["__version__"],
|
||||
url="https://github.com/overhangio/tutor-credentials.git",
|
||||
project_urls={
|
||||
"Code": "https://github.com/overhangio/tutor-credentials.git",
|
||||
|
||||
@ -1,9 +1,2 @@
|
||||
__version__ = "16.0.2"
|
||||
__package_version__ = __version__
|
||||
|
||||
# Handle version suffix for nightly, just like tutor core.
|
||||
__version_suffix__ = ""
|
||||
|
||||
if __version_suffix__:
|
||||
__version__ += "-" + __version_suffix__
|
||||
|
||||
|
||||
@ -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__
|
||||
|
||||
|
||||
########################################
|
||||
# CONFIGURATION
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user