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
84ceed2f92
commit
7317758ca9
2
setup.py
2
setup.py
@ -15,7 +15,7 @@ with io.open(
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="tutor-xqueue",
|
name="tutor-xqueue",
|
||||||
version=about["__package_version__"],
|
version=about["__version__"],
|
||||||
url="https://docs.tutor.overhang.io/",
|
url="https://docs.tutor.overhang.io/",
|
||||||
project_urls={
|
project_urls={
|
||||||
"Documentation": "https://docs.tutor.overhang.io/",
|
"Documentation": "https://docs.tutor.overhang.io/",
|
||||||
|
|||||||
@ -1,8 +1,2 @@
|
|||||||
__version__ = "16.0.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__
|
|
||||||
|
|||||||
@ -10,11 +10,16 @@ import pkg_resources
|
|||||||
import requests
|
import requests
|
||||||
|
|
||||||
from tutor import config as tutor_config
|
from tutor import config as tutor_config
|
||||||
|
from tutor.__about__ import __version_suffix__
|
||||||
from tutor import exceptions
|
from tutor import exceptions
|
||||||
from tutor import hooks as tutor_hooks
|
from tutor import hooks as tutor_hooks
|
||||||
|
|
||||||
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": {
|
"unique": {
|
||||||
"AUTH_PASSWORD": "{{ 8|random_string }}",
|
"AUTH_PASSWORD": "{{ 8|random_string }}",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user