Revision: 3640
Author: jussi.ao.malinen
Date: Fri May 28 04:44:05 2010
Log: moved get_full_version to version.py
http://code.google.com/p/robotframework/source/detail?r=3640
Modified:
/trunk/package.py
/trunk/src/robot/__init__.py
/trunk/src/robot/output/xmllogger.py
/trunk/src/robot/serializing/testoutput.py
/trunk/src/robot/version.py
=======================================
--- /trunk/package.py Sun Apr 19 13:26:54 2009
+++ /trunk/package.py Fri May 28 04:44:05 2010
@@ -61,6 +61,8 @@
RELEASES = [re.compile('^alpha\d*$'), re.compile('^beta\d*$'),
re.compile('^rc\d*$'), 'final']
VERSION_CONTENT = """# Automatically generated by 'package.py' script.
+import sys
+
VERSION = '%(version_number)s'
RELEASE = '%(release_tag)s'
@@ -71,8 +73,14 @@
return VERSION
return VERSION + sep + RELEASE
+def get_full_version(who=''):
+ interpreter = sys.platform.startswith('java') and 'Jython'
or 'Python'
+ syversion = sys.version.split()[0]
+ vers = '%%s %%s (%%s %%s on %%s)' %% (who, get_version(), interpreter,
+ syversion, sys.platform)
+ return vers.strip()
+
if __name__ == '__main__':
- import sys
print get_version(*sys.argv[1:])
"""
=======================================
--- /trunk/src/robot/__init__.py Fri May 28 03:49:58 2010
+++ /trunk/src/robot/__init__.py Fri May 28 04:44:05 2010
@@ -27,7 +27,7 @@
from errors import DataError, Information, XmlParsingError, INFO_PRINTED, \
DATA_ERROR, STOPPED_BY_USER, FRAMEWORK_ERROR
from variables import init_global_variables
-from version import get_version
+from version import get_version, get_full_version
import utils
@@ -35,16 +35,16 @@
def run_from_cli(args, usage):
- LOGGER.info(utils.get_full_version('Robot Framework'))
+ LOGGER.info(get_full_version('Robot Framework'))
_run_or_rebot_from_cli(run, args, usage, pythonpath='pythonpath')
def rebot_from_cli(args, usage):
- LOGGER.info(utils.get_full_version('Rebot'))
+ LOGGER.info(get_full_version('Rebot'))
_run_or_rebot_from_cli(rebot, args, usage)
def _run_or_rebot_from_cli(method, cliargs, usage, **argparser_config):
LOGGER.register_file_logger()
- ap = utils.ArgumentParser(usage, utils.get_full_version())
+ ap = utils.ArgumentParser(usage, get_full_version())
try:
options, datasources = \
ap.parse_args(cliargs, argfile='argumentfile',
unescape='escape',
=======================================
--- /trunk/src/robot/output/xmllogger.py Tue Mar 23 04:15:41 2010
+++ /trunk/src/robot/output/xmllogger.py Fri May 28 04:44:05 2010
@@ -17,6 +17,7 @@
from robot import utils
from robot.errors import DataError
+from robot.version import get_full_version
from loggerhelper import IsLogged
@@ -27,7 +28,7 @@
self._namegen = utils.FileNameGenerator(path)
self._log_message_is_logged = IsLogged(log_level)
self._error_is_logged = IsLogged('WARN')
- attrs = { 'generator': utils.get_full_version(generator),
+ attrs = { 'generator': get_full_version(generator),
'generated': utils.get_timestamp() }
self._writer = None
self._writer_args = (path, attrs)
=======================================
--- /trunk/src/robot/serializing/testoutput.py Tue Mar 23 04:15:41 2010
+++ /trunk/src/robot/serializing/testoutput.py Fri May 28 04:44:05 2010
@@ -20,6 +20,7 @@
from robot.common import Statistics
from robot.conf import get_title
from robot.output import LOGGER, process_outputs, process_output
+from robot.version import get_full_version
import templates
from templating import Namespace, Template
@@ -133,7 +134,7 @@
elapsed_time = utils.elapsed_time_to_string(self.suite.elapsedtime)
namespace = Namespace(gentime_str=str_time, gentime_int=int_time,
elapsed_time=elapsed_time,
-
version=utils.get_full_version(self._generator),
+ version=get_full_version(self._generator),
suite=self.suite, title=title)
tmpl = Template(template=template)
tmpl.generate(namespace, outfile)
=======================================
--- /trunk/src/robot/version.py Thu May 6 06:51:57 2010
+++ /trunk/src/robot/version.py Fri May 28 04:44:05 2010
@@ -1,14 +1,22 @@
# Automatically generated by 'package.py' script.
+import sys
+
VERSION = 'trunk'
-RELEASE = '20100506'
-TIMESTAMP = '20100506-165026'
+RELEASE = '20100528'
+TIMESTAMP = '20100528-143734'
def get_version(sep=' '):
if RELEASE == 'final':
return VERSION
return VERSION + sep + RELEASE
+def get_full_version(who=''):
+ interpreter = sys.platform.startswith('java') and 'Jython'
or 'Python'
+ syversion = sys.version.split()[0]
+ vers = '%s %s (%s %s on %s)' % (who, get_version(), interpreter,
+ syversion, sys.platform)
+ return vers.strip()
+
if __name__ == '__main__':
- import sys
print get_version(*sys.argv[1:])
