incubator-ariatosca git commit: CFY-4 fixed py2.6-incompatible usages [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-3-api-for-creating-workflows 3397e4a6c -> 936e2f97e (forced update) CFY-4 fixed py2.6-incompatible usages Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/936e2f97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/936e2f97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/936e2f97 Branch: refs/heads/ARIA-3-api-for-creating-workflows Commit: 936e2f97e8f56450f4778f33c4f04a46da803e37 Parents: f493fe8 Author: Ran Ziv Authored: Sun Oct 30 13:51:52 2016 +0200 Committer: Ran Ziv Committed: Sun Oct 30 14:26:54 2016 +0200 -- aria/logger.py | 6 +++--- aria/storage/drivers.py | 2 +- aria/workflows/core/executor.py | 2 +- requirements.txt| 1 + 4 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/936e2f97/aria/logger.py -- diff --git a/aria/logger.py b/aria/logger.py index 4959126..0002cb5 100644 --- a/aria/logger.py +++ b/aria/logger.py @@ -37,7 +37,7 @@ class LoggerMixin(object): def __init__(self, *args, **kwargs): self.logger_name = self.logger_name or self.__class__.__name__ -self.logger = _base_logger.getChild(self.logger_name) +self.logger = logging.getLogger('{0}.{1}'.format(_base_logger.name, self.logger_name)) self.logger.setLevel(self.logger_level) super(LoggerMixin, self).__init__(*args, **kwargs) @@ -63,7 +63,7 @@ class LoggerMixin(object): def __setstate__(self, obj_dict): vars(self).update( -logger=_base_logger.getChild(obj_dict['logger_name']), +logger=logging.getLogger('{0}.{1}'.format(_base_logger.name, obj_dict['logger_name'])), **obj_dict) @@ -112,7 +112,7 @@ class _DefaultConsoleFormat(logging.Formatter): self._fmt = '%(levelname)s: %(message)s' except AttributeError: return record.message -return super(_DefaultConsoleFormat, self).format(record) +return logging.Formatter.format(self, record) def create_file_log_handler( http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/936e2f97/aria/storage/drivers.py -- diff --git a/aria/storage/drivers.py b/aria/storage/drivers.py index 0ad2f49..33b7c00 100644 --- a/aria/storage/drivers.py +++ b/aria/storage/drivers.py @@ -32,7 +32,7 @@ import shutil # pylint has an issue with distutils and virtualenvs: https://github.com/PyCQA/pylint/issues/73 import distutils.dir_util # pylint: disable=no-name-in-module, import-error from functools import partial -from multiprocessing import RLock +from billiard import RLock import jsonpickle http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/936e2f97/aria/workflows/core/executor.py -- diff --git a/aria/workflows/core/executor.py b/aria/workflows/core/executor.py index ace445a..1abecac 100644 --- a/aria/workflows/core/executor.py +++ b/aria/workflows/core/executor.py @@ -18,7 +18,7 @@ Executors for workflow tasks """ import threading -import multiprocessing +import billiard as multiprocessing import Queue import jsonpickle http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/936e2f97/requirements.txt -- diff --git a/requirements.txt b/requirements.txt index 1240b72..b585039 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ # limitations under the License. PyYAML==3.10 +billiard==3.3.0.20 networkx==1.9 requests==2.7.0 retrying==1.3.3
incubator-ariatosca git commit: CFY-4 fixed py2.6-incompatible usages [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-3-api-for-creating-workflows 9672e5f62 -> 3397e4a6c (forced update) CFY-4 fixed py2.6-incompatible usages Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/3397e4a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/3397e4a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/3397e4a6 Branch: refs/heads/ARIA-3-api-for-creating-workflows Commit: 3397e4a6cd9c62994ac53da568dac86a5872947b Parents: f493fe8 Author: Ran Ziv Authored: Sun Oct 30 13:51:52 2016 +0200 Committer: Ran Ziv Committed: Sun Oct 30 14:22:09 2016 +0200 -- aria/logger.py | 6 +++--- aria/storage/drivers.py | 2 +- aria/workflows/core/executor.py | 2 +- requirements.txt| 1 + 4 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3397e4a6/aria/logger.py -- diff --git a/aria/logger.py b/aria/logger.py index 4959126..65bd653 100644 --- a/aria/logger.py +++ b/aria/logger.py @@ -37,7 +37,7 @@ class LoggerMixin(object): def __init__(self, *args, **kwargs): self.logger_name = self.logger_name or self.__class__.__name__ -self.logger = _base_logger.getChild(self.logger_name) +self.logger = logging.getLogger('{0}.{1}'.format(_base_logger.name, self.logger_name)) self.logger.setLevel(self.logger_level) super(LoggerMixin, self).__init__(*args, **kwargs) @@ -63,7 +63,7 @@ class LoggerMixin(object): def __setstate__(self, obj_dict): vars(self).update( -logger=_base_logger.getChild(obj_dict['logger_name']), +logger=logging.getLogger('{0}.{1}'.format(_base_logger.name, obj_dict['logger_name'])), **obj_dict) @@ -112,7 +112,7 @@ class _DefaultConsoleFormat(logging.Formatter): self._fmt = '%(levelname)s: %(message)s' except AttributeError: return record.message -return super(_DefaultConsoleFormat, self).format(record) +return logging.Formatter.format(record) def create_file_log_handler( http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3397e4a6/aria/storage/drivers.py -- diff --git a/aria/storage/drivers.py b/aria/storage/drivers.py index 0ad2f49..33b7c00 100644 --- a/aria/storage/drivers.py +++ b/aria/storage/drivers.py @@ -32,7 +32,7 @@ import shutil # pylint has an issue with distutils and virtualenvs: https://github.com/PyCQA/pylint/issues/73 import distutils.dir_util # pylint: disable=no-name-in-module, import-error from functools import partial -from multiprocessing import RLock +from billiard import RLock import jsonpickle http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3397e4a6/aria/workflows/core/executor.py -- diff --git a/aria/workflows/core/executor.py b/aria/workflows/core/executor.py index ace445a..1abecac 100644 --- a/aria/workflows/core/executor.py +++ b/aria/workflows/core/executor.py @@ -18,7 +18,7 @@ Executors for workflow tasks """ import threading -import multiprocessing +import billiard as multiprocessing import Queue import jsonpickle http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3397e4a6/requirements.txt -- diff --git a/requirements.txt b/requirements.txt index 1240b72..b585039 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ # limitations under the License. PyYAML==3.10 +billiard==3.3.0.20 networkx==1.9 requests==2.7.0 retrying==1.3.3
incubator-ariatosca git commit: CFY-4 fixed py2.6-incompatible usages [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-3-api-for-creating-workflows c4a0e1144 -> 9672e5f62 (forced update) CFY-4 fixed py2.6-incompatible usages Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9672e5f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9672e5f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9672e5f6 Branch: refs/heads/ARIA-3-api-for-creating-workflows Commit: 9672e5f621c2cb7b87a7e5e52addbfdb908e694a Parents: f493fe8 Author: Ran Ziv Authored: Sun Oct 30 13:51:52 2016 +0200 Committer: Ran Ziv Committed: Sun Oct 30 13:59:04 2016 +0200 -- aria/logger.py | 4 ++-- aria/storage/drivers.py | 2 +- aria/workflows/core/executor.py | 2 +- requirements.txt| 1 + 4 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9672e5f6/aria/logger.py -- diff --git a/aria/logger.py b/aria/logger.py index 4959126..67ee7ff 100644 --- a/aria/logger.py +++ b/aria/logger.py @@ -37,7 +37,7 @@ class LoggerMixin(object): def __init__(self, *args, **kwargs): self.logger_name = self.logger_name or self.__class__.__name__ -self.logger = _base_logger.getChild(self.logger_name) +self.logger = logging.getLogger('{0}.{1}'.format(_base_logger.name, self.logger_name)) self.logger.setLevel(self.logger_level) super(LoggerMixin, self).__init__(*args, **kwargs) @@ -63,7 +63,7 @@ class LoggerMixin(object): def __setstate__(self, obj_dict): vars(self).update( -logger=_base_logger.getChild(obj_dict['logger_name']), +logger=logging.getLogger('{0}.{1}'.format(_base_logger.name, obj_dict['logger_name'])), **obj_dict) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9672e5f6/aria/storage/drivers.py -- diff --git a/aria/storage/drivers.py b/aria/storage/drivers.py index 0ad2f49..33b7c00 100644 --- a/aria/storage/drivers.py +++ b/aria/storage/drivers.py @@ -32,7 +32,7 @@ import shutil # pylint has an issue with distutils and virtualenvs: https://github.com/PyCQA/pylint/issues/73 import distutils.dir_util # pylint: disable=no-name-in-module, import-error from functools import partial -from multiprocessing import RLock +from billiard import RLock import jsonpickle http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9672e5f6/aria/workflows/core/executor.py -- diff --git a/aria/workflows/core/executor.py b/aria/workflows/core/executor.py index ace445a..1abecac 100644 --- a/aria/workflows/core/executor.py +++ b/aria/workflows/core/executor.py @@ -18,7 +18,7 @@ Executors for workflow tasks """ import threading -import multiprocessing +import billiard as multiprocessing import Queue import jsonpickle http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9672e5f6/requirements.txt -- diff --git a/requirements.txt b/requirements.txt index 1240b72..b585039 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ # limitations under the License. PyYAML==3.10 +billiard==3.3.0.20 networkx==1.9 requests==2.7.0 retrying==1.3.3