diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f815a71e..dc40aca38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## moler 2.0.0 + +### Improved + +* Change default runner and connection type (less threads). +* Improve removing escape character from unix output + ## moler 1.33.0 ### Improved diff --git a/README.md b/README.md index 2c067fed1..02a3f8f1e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![image](https://img.shields.io/badge/pypi-v1.33.0-blue.svg)](https://pypi.org/project/moler/) +[![image](https://img.shields.io/badge/pypi-v2.0.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) diff --git a/docs/source/conf.py b/docs/source/conf.py index 33f125a4b..8fbaf6819 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -20,11 +20,11 @@ # -- Project information ----------------------------------------------------- project = 'Moler' -copyright = '2019, Nokia' +copyright = '2019-2022, Nokia' author = 'Nokia' # The short X.Y version -version = '1.33.0' +version = '2.0.0' # The full version, including alpha/beta/rc tags release = 'stable' diff --git a/moler/connection_factory.py b/moler/connection_factory.py index 54ab0a530..b4598608a 100644 --- a/moler/connection_factory.py +++ b/moler/connection_factory.py @@ -194,7 +194,7 @@ def _try_get_connection_with_name(io_type, variant, **constructor_kwargs): # actions during import -connection_cfg.register_builtin_connections(ConnectionFactory, ThreadedMolerConnection) # Default in Moler 1.x.y -# connection_cfg.register_builtin_connections(ConnectionFactory, MolerConnectionForSingleThreadRunner) # will be -# default since Moler 2.0.0 +# connection_cfg.register_builtin_connections(ConnectionFactory, ThreadedMolerConnection) # Default in Moler 1.x.y +connection_cfg.register_builtin_connections(ConnectionFactory, MolerConnectionForSingleThreadRunner) # default since +# Moler 2.0.0 connection_cfg.set_defaults() diff --git a/moler/device/textualdevice.py b/moler/device/textualdevice.py index f7f2e76ed..64ecb1b29 100644 --- a/moler/device/textualdevice.py +++ b/moler/device/textualdevice.py @@ -5,7 +5,7 @@ - be the state machine that controls which commands may run in given state """ __author__ = 'Grzegorz Latuszek, Marcin Usielski, Michal Ernst' -__copyright__ = 'Copyright (C) 2018-2021, Nokia' +__copyright__ = 'Copyright (C) 2018-2022, Nokia' __email__ = 'grzegorz.latuszek@nokia.com, marcin.usielski@nokia.com, michal.ernst@nokia.com' import abc @@ -185,12 +185,16 @@ def establish_connection(self): with self._state_prompts_lock: self._run_prompts_observers() - msg = "Established connection to device '{}' (as instance of class '{}.{}') with prompts: '{}'.".format( - self.name, - self.__class__.__module__, - self.__class__.__name__, - self._state_prompts - ) + msg = "Established connection to device '{}' (as instance of class '{}.{}', io_connection: '{}.{}', " \ + "moler_connection: '{}.{}') with prompts: '{}'.".format(self.name, + self.__class__.__module__, + self.__class__.__name__, + self.io_connection.__class__.__module__, + self.io_connection.__class__.__name__, + self.io_connection.moler_connection.__class__.__module__, + self.io_connection.moler_connection.__class__.__name__, + self._state_prompts + ) self._established = True self._log(level=logging.INFO, msg=msg) diff --git a/setup.py b/setup.py index 17b38dd77..84490c7ab 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( name='moler', # Required - version='1.33.0', # Required + version='2.0.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)