Move __version__ from main app to top level mayan directory

This commit is contained in:
Roberto Rosario
2014-06-21 02:42:26 -04:00
parent c5c240c12e
commit dc5a36292e
6 changed files with 7 additions and 38 deletions

View File

@@ -0,0 +1 @@
__version__ = '1.0.0beta2'

View File

@@ -2,19 +2,19 @@ from __future__ import absolute_import
import datetime
from mayan import __version__
from navigation.api import register_links
from main import __version__
from .classes import FixtureMetadata
from .links import (link_bootstrap_setup_create, link_bootstrap_setup_execute,
link_bootstrap_setup_list, link_bootstrap_setup_edit, link_bootstrap_setup_delete,
link_bootstrap_setup_view, link_bootstrap_setup_dump, link_bootstrap_setup_export,
link_bootstrap_setup_import_from_url, link_bootstrap_setup_import_from_file,
link_bootstrap_setup_repository_sync)
from .models import BootstrapSetup
from .classes import FixtureMetadata
from .literals import (FIXTURE_METADATA_CREATED, FIXTURE_METADATA_EDITED,
FIXTURE_METADATA_MAYAN_VERSION, FIXTURE_METADATA_FORMAT, FIXTURE_METADATA_NAME,
FIXTURE_METADATA_DESCRIPTION, DATETIME_STRING_FORMAT, FIXTURE_METADATA_SLUG)
from .models import BootstrapSetup
register_links([BootstrapSetup], [link_bootstrap_setup_view, link_bootstrap_setup_edit, link_bootstrap_setup_delete, link_bootstrap_setup_execute, link_bootstrap_setup_export])
register_links([BootstrapSetup], [link_bootstrap_setup_list, link_bootstrap_setup_create, link_bootstrap_setup_dump, link_bootstrap_setup_import_from_file, link_bootstrap_setup_import_from_url, link_bootstrap_setup_repository_sync], menu_name='secondary_menu')

View File

@@ -8,6 +8,6 @@ register = Library()
def app_version(app_name):
try:
app = import_module(app_name)
return app.get_version()
return app.__version__
except ImportError:
return u''

View File

@@ -26,7 +26,7 @@ from django.conf import settings
from common.models import Singleton
from common.utils import pretty_size
from main import __version__ as mayan_version
from mayan import __version__ as mayan_version
from lock_manager import Lock, LockError
from ocr.conf.settings import TESSERACT_PATH, UNPAPER_PATH, PDFTOTEXT_PATH

View File

@@ -11,43 +11,11 @@ from project_tools.api import register_tool
from .conf.settings import SIDE_BAR_SEARCH, DISABLE_HOME_VIEW
from .links import (admin_site, diagnostics, maintenance_menu, sentry, statistics)
__author__ = 'Roberto Rosario'
__copyright__ = 'Copyright 2012 Roberto Rosario'
__credits__ = ['Roberto Rosario',]
__license__ = 'GPL'
__maintainer__ = 'Roberto Rosario'
__email__ = 'roberto.rosario.gonzalez@gmail.com'
__status__ = 'Production'
__version_info__ = {
'major': 1,
'minor': 0,
'micro': 0,
'releaselevel': 'beta',
'serial': 0
}
if not DISABLE_HOME_VIEW:
register_top_menu('home', link={'text': _(u'home'), 'view': 'home', 'famfam': 'house'}, position=0)
if not SIDE_BAR_SEARCH:
register_top_menu('search', link={'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'}, children_path_regex=[r'^search/'])
def get_version():
'''
Return the formatted version information
'''
vers = ['%(major)i.%(minor)i' % __version_info__, ]
if __version_info__['micro']:
vers.append('.%(micro)i' % __version_info__)
if __version_info__['releaselevel'] != 'final':
vers.append('%(releaselevel)s%(serial)i' % __version_info__)
return ''.join(vers)
__version__ = get_version()
if 'django.contrib.admin' in settings.INSTALLED_APPS:
register_setup(admin_site)

View File

@@ -6,7 +6,7 @@
{% block content %}
<div class="content tc">
<h3>{% project_name %} ({% trans "Version" %} {% app_version "main" %})</h3>
<h3>{% project_name %} ({% trans "Version" %} {% app_version "mayan" %})</h3>
</div>
{% include "project_description.html" %}