Merge "Drop bunch dependency"
This commit is contained in:
commit
8c5bc5d9ec
|
@ -18,11 +18,11 @@ import sys
|
|||
import time
|
||||
import types
|
||||
|
||||
import bunch
|
||||
from oslo_log import log as logging
|
||||
from oslo_service import service
|
||||
import semantic_version
|
||||
|
||||
from muranoagent import bunch
|
||||
from muranoagent.common import config
|
||||
from muranoagent.common import messaging
|
||||
from muranoagent import exceptions as exc
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
# Copyright (c) 2014 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
class Bunch(dict):
|
||||
"""Bunch dict/object-like container.
|
||||
|
||||
Bunch container provides both dictionary-like and
|
||||
object-like attribute access.
|
||||
"""
|
||||
def __getattr__(self, item):
|
||||
return self.__getitem__(item)
|
||||
|
||||
def __setattr__(self, key, value):
|
||||
return self.__setitem__(key, value)
|
||||
|
||||
def __delattr__(self, key):
|
||||
del self[key]
|
|
@ -18,8 +18,8 @@ import os
|
|||
import shutil
|
||||
import time
|
||||
|
||||
import bunch
|
||||
|
||||
from muranoagent import bunch
|
||||
from muranoagent.common import config
|
||||
|
||||
CONF = config.CONF
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
|
||||
import sys
|
||||
|
||||
import bunch
|
||||
|
||||
from muranoagent import bunch
|
||||
from muranoagent import files_manager as fm
|
||||
from muranoagent import script_runner
|
||||
|
||||
|
|
|
@ -18,9 +18,9 @@ import stat
|
|||
import subprocess
|
||||
import sys
|
||||
|
||||
import bunch
|
||||
from oslo_log import log as logging
|
||||
|
||||
from muranoagent import bunch
|
||||
import muranoagent.exceptions
|
||||
from muranoagent import executors
|
||||
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import bunch
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
from oslo_log import log as logging
|
||||
|
||||
from muranoagent import bunch
|
||||
import muranoagent.exceptions
|
||||
from muranoagent import executors
|
||||
from muranoagent.executors import chef_puppet_executor_base
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import bunch
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
from oslo_log import log as logging
|
||||
|
||||
from muranoagent import bunch
|
||||
import muranoagent.exceptions
|
||||
from muranoagent import executors
|
||||
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
# implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
import bunch
|
||||
import os
|
||||
import subprocess
|
||||
import yaml
|
||||
|
||||
from oslo_log import log as logging
|
||||
|
||||
from muranoagent import bunch
|
||||
import muranoagent.exceptions
|
||||
from muranoagent import executors
|
||||
from muranoagent.executors import chef_puppet_executor_base
|
||||
|
|
|
@ -13,9 +13,10 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import bunch
|
||||
import fixtures
|
||||
|
||||
from muranoagent import bunch
|
||||
|
||||
|
||||
class ExPlanDownloable(fixtures.Fixture):
|
||||
def setUp(self):
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import bunch
|
||||
import fixtures
|
||||
import json
|
||||
import mock
|
||||
from mock import ANY
|
||||
import os
|
||||
|
||||
from muranoagent import bunch
|
||||
from muranoagent.common import config as cfg
|
||||
from muranoagent import exceptions as ex
|
||||
from muranoagent.executors import chef
|
||||
|
|
|
@ -11,10 +11,11 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import bunch
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
|
||||
from muranoagent import bunch
|
||||
from muranoagent.common import config as cfg
|
||||
from muranoagent import exceptions as ex
|
||||
from muranoagent.executors import puppet
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import bunch
|
||||
import fixtures
|
||||
import mock
|
||||
|
||||
from muranoagent import app
|
||||
from muranoagent import bunch
|
||||
from muranoagent.common import config as cfg
|
||||
from muranoagent import exceptions as exc
|
||||
from muranoagent.tests.unit import base
|
||||
|
|
|
@ -12,10 +12,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import bunch
|
||||
import mock
|
||||
import os.path
|
||||
|
||||
from muranoagent import bunch
|
||||
from muranoagent.common import config as cfg
|
||||
from muranoagent import files_manager
|
||||
from muranoagent.tests.unit import base
|
||||
|
|
|
@ -12,10 +12,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import bunch
|
||||
import git
|
||||
import mock
|
||||
|
||||
from muranoagent import bunch
|
||||
from muranoagent.common import config as cfg
|
||||
from muranoagent import files_manager as fmanager
|
||||
from muranoagent import script_runner
|
||||
|
|
|
@ -5,6 +5,7 @@ pbr<2.0,>=0.11
|
|||
anyjson>=0.3.3
|
||||
Babel>=1.3
|
||||
eventlet>=0.17.4
|
||||
GitPython>=1.0.1 # BSD License (3 clause)
|
||||
iso8601>=0.1.9
|
||||
kombu>=3.0.7
|
||||
oslo.config>=1.11.0 # Apache-2.0
|
||||
|
@ -16,7 +17,3 @@ six>=1.9.0
|
|||
stevedore>=1.5.0 # Apache-2.0
|
||||
semantic-version>=2.3.1
|
||||
requests>=2.5.2
|
||||
|
||||
# not listed in global requirements
|
||||
bunch
|
||||
gitpython
|
||||
|
|
Loading…
Reference in New Issue