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 84ceed2 commit 7317758
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

setup(
name="tutor-xqueue",
version=about["__package_version__"],
version=about["__version__"],
url="https://docs.tutor.overhang.io/",
project_urls={
"Documentation": "https://docs.tutor.overhang.io/",
Expand Down
6 changes: 0 additions & 6 deletions tutorxqueue/__about__.py
Original file line number Diff line number Diff line change
@@ -1,8 +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__
5 changes: 5 additions & 0 deletions tutorxqueue/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@
import requests

from tutor import config as tutor_config
from tutor.__about__ import __version_suffix__
from tutor import exceptions
from tutor import hooks as tutor_hooks

from .__about__ import __version__

# Handle version suffix in nightly mode, just like tutor core
if __version_suffix__:
__version__ += "-" + __version_suffix__

config = {
"unique": {
"AUTH_PASSWORD": "{{ 8|random_string }}",
Expand Down

0 comments on commit 7317758

Please sign in to comment.