Release 0.3.0 with a 3 field version string convention

README.md

@@ -71,18 +71,20 @@ to skip all existing files. We apologize for the inconveniences it incurs.
 
 ### Upcoming release
 
-Goal for 0.2.11
+Goal for 0.4.0
 
 - Support for multiple output per modules.
 - Improve scripts command options.
 
-### 0.2.x
+### 0.3.x
 
-0.2.10.0
+0.3.0
 
-- SoS bumped to version 0.9.16.8 to support a new implementation of signatures.
+- SoS bumped to version 0.16.9 to support a new implementation of signatures.
 - [minor] Bug fix #147.
 
+### 0.2.x
+
 0.2.9.1
 
 - Stop moving library imports to the front of scripts, due to various side effect.

dscrutils/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: dscrutils
 Encoding: UTF-8
 Type: Package
-Version: 0.2.10.0
+Version: 0.3.0
 Date: 2018-02-21
 Title: Dynamic Statistical Comparisons R Interface
 Authors@R: c(person("Gao","Wang",role=c("aut","cre"),

setup.py

@@ -53,7 +53,7 @@ def run(self):
  cmdclass = cmdclass,
  package_dir = {'dsc': 'src'},
  install_requires = ['numpy', 'pandas>=0.23.0', 'sympy', 'numexpr',
- 'sos>=0.9.16.8', 'sos-pbs>=0.9.16.0', 'h5py', 'PTable',
+ 'sos>=0.16.9', 'sos-pbs>=0.9.16.0', 'h5py', 'PTable',
  'pyarrow>=0.5.0', 'sqlalchemy', 'tzlocal',
  'msgpack-python']
  )

src/line.py

@@ -201,8 +201,10 @@ def __Python(code):
  raise FormatError(f"Evaluation of the following Python expression failed:\n``{code}``.\nError message: ``{e}``")
  if isinstance(res, (bool, int, float, str)):
  return str(res)
- elif isinstance(res, (list, tuple)):
+ elif isinstance(res, list):
  return ','.join(map(str, res))
+ elif isinstance(res, tuple):
+ return f"({','.join(map(str, res))})"
  else:
  raise FormatError(f"Evaluation of Python expression ``code`` resulted in unsupported type ``{type(res).__name__}``.")
 

src/plugin.py

@@ -539,7 +539,11 @@ def add_try(content, n_output):
 
  @staticmethod
  def format_tuple(value):
- return '({})'.format(','.join(value))
+ has_tuple = any([re.match(r'(.*?)\((.*?)\)(.*?)', str(v)) for v in value])
+ if has_tuple:
+ return '({})'.format(','.join([f"({','.join(v)})" for v in value]))
+ else:
+ return '({})'.format(','.join(value))
 
  def __str__(self):
  return 'python'

src/version.py

@@ -1 +1 @@
-__version__ = '0.2.10.0'
+__version__ = '0.3.0'