Merge pull request #320 from nokia/release_v1.14.0

New release v1.14.0

CHANGELOG.md

@@ -1,3 +1,8 @@
+## moler 1.14.0
+
+### Improved
+* Support for text files with content the same as errors from commands
+
 ## moler 1.13.0
 
 ### Improved

README.md

@@ -1,4 +1,4 @@
-[![image](https://img.shields.io/badge/pypi-v1.13.0-blue.svg)](https://pypi.org/project/moler/)
+[![image](https://img.shields.io/badge/pypi-v1.14.0-blue.svg)](https://pypi.org/project/moler/)
 [![image](https://img.shields.io/badge/python-2.7%20%7C%203.6%20%7C%203.7%20%7C%203.8-blue.svg)](https://pypi.org/project/moler/)
 [![Build Status](https://travis-ci.org/nokia/moler.svg?branch=master)](https://travis-ci.org/nokia/moler)
 [![Coverage Status](https://coveralls.io/repos/github/nokia/moler/badge.svg?branch=master)](https://coveralls.io/github/nokia/moler?branch=master)

docs/source/conf.py

@@ -24,7 +24,7 @@
 author = 'Nokia'
 
 # The short X.Y version
-version = '1.13.0'
+version = '1.14.0'
 # The full version, including alpha/beta/rc tags
 release = 'stable'
 

moler/cmd/scpi/scpi/run_command.py

@@ -8,13 +8,13 @@
 import re
 
 __author__ = 'Marcin Usielski'
-__copyright__ = 'Copyright (C) 2019, Nokia'
+__copyright__ = 'Copyright (C) 2019-2020, Nokia'
 __email__ = '[email protected]'
 
 
 class RunCommand(GenericScpiState):
 
-    def __init__(self, connection, command, error_regex=re.compile(r"ERROR", re.I), prompt=None,
+    def __init__(self, connection, command, error_regex=re.compile(r"ERROR", re.IGNORECASE), prompt=None,
                  newline_chars=None, runner=None):
         """
         Class for command CONF for SCPI device.

moler/cmd/unix/run_script.py

@@ -4,7 +4,7 @@
 """
 
 __author__ = 'Marcin Usielski'
-__copyright__ = 'Copyright (C) 2018, Nokia'
+__copyright__ = 'Copyright (C) 2018-2020, Nokia'
 __email__ = '[email protected]'
 
 import re
@@ -15,7 +15,8 @@
 
 class RunScript(GenericUnixCommand):
 
-    def __init__(self, connection, script_command, error_regex=re.compile("error", re.I), prompt=None, newline_chars=None, runner=None):
+    def __init__(self, connection, script_command, error_regex=re.compile("error", re.IGNORECASE),
+                 prompt=None, newline_chars=None, runner=None):
         """
         :param connection: Moler connection to device, terminal when command is executed.
         :param script_command: path to script to run.

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='moler',  # Required
-    version='1.13.0',  # Required
+    version='1.14.0',  # Required
     description='Moler is library to help in building automated tests',  # Required
     long_description=long_description,  # Optional
     long_description_content_type='text/markdown',  # Optional (see note above)