Merge pull request #58 from jeromelebleu/dev

Refactor moulinette versioning
This commit is contained in:
Alexis Gavoty 2013-12-19 04:46:33 -08:00
commit 148308e8e5
3 changed files with 6 additions and 6 deletions

View file

@ -37,9 +37,9 @@
general_arguments: general_arguments:
-v: -v:
full: --version full: --version
help: Display YunoHost version help: Display moulinette version
action: version action: version
version: YunoHost %version% version: moulinette %version%
############################# #############################
# User # # User #

View file

@ -28,7 +28,7 @@ import sys
import yaml import yaml
import json import json
import requests import requests
from yunohost import str_to_func from yunohost import str_to_func, __version__
def main(): def main():
""" """
@ -47,7 +47,7 @@ def main():
action_map = yaml.load(f) action_map = yaml.load(f)
resource_list = { resource_list = {
'apiVersion': '0.1', 'apiVersion': __version__,
'swaggerVersion': '1.1', 'swaggerVersion': '1.1',
'basePath': 'http://'+ domain + ':6767', 'basePath': 'http://'+ domain + ':6767',
'apis': [] 'apis': []
@ -64,7 +64,7 @@ def main():
'description': category_params['category_help'] 'description': category_params['category_help']
}) })
resources[category] = { resources[category] = {
'apiVersion': '0.1', 'apiVersion': __version__,
'swaggerVersion': '1.1', 'swaggerVersion': '1.1',
'basePath': 'http://'+ domain + ':6767', 'basePath': 'http://'+ domain + ':6767',
'apis': [] 'apis': []

View file

@ -40,7 +40,7 @@ __credits__ = """
along with this program; if not, see http://www.gnu.org/licenses along with this program; if not, see http://www.gnu.org/licenses
""" """
__author__ = 'Kload <kload@kload.fr>' __author__ = 'Kload <kload@kload.fr>'
__version__ = '2.0-beta3' __version__ = '695'
import os import os
import sys import sys