Switching from own common.py to fb_tools.common

diff --git a/lib/webhooks/base_app.py b/lib/webhooks/base_app.py
index c7575cace1f9d9d763a46ea76ec945421d1eaf92..16de57375f94452c42bea069e834d047db89df7e 100644 (file)
--- a/lib/webhooks/base_app.py
+++ b/lib/webhooks/base_app.py
@@ -35,7 +35,7 @@ import pytz
 # Own modules
 import webhooks
 
-from .common import pp, to_bytes, to_bool
+from fb_tools.common import pp, to_bytes, to_bool
 
 from .obj import BaseObjectError, BaseObject
 

diff --git a/lib/webhooks/deploy.py b/lib/webhooks/deploy.py
index d20ed8eeb10564cb60f49f0f11f99bdcf63d4270..b3ff4176787baec080bf608d9fec3583b5a54619 100644 (file)
--- a/lib/webhooks/deploy.py
+++ b/lib/webhooks/deploy.py
@@ -18,9 +18,9 @@ import pipes
 # Third party modules
 
 # Own modules
-from . import __version__
+from fb_tools.common import pp, to_str
 
-from .common import pp, to_str
+from . import __version__
 
 from .base_app import BaseHookApp
 

diff --git a/lib/webhooks/get_forge_modules.py b/lib/webhooks/get_forge_modules.py
index 87834095d094d9cecaa37f8a366be2fb4a167247..80d148e311bb86bae5ef48f2fee0d2f3df5f20d4 100644 (file)
--- a/lib/webhooks/get_forge_modules.py
+++ b/lib/webhooks/get_forge_modules.py
@@ -30,9 +30,9 @@ import yaml
 from six import reraise
 
 # Own modules
-from . import __version__
+from fb_tools.common import pp, to_bytes, to_bool
 
-from .common import pp, to_bytes, to_bool
+from . import __version__
 
 from .base_app import BaseHookError, BaseHookApp
 

diff --git a/lib/webhooks/get_module_changes.py b/lib/webhooks/get_module_changes.py
index e62d9fc747400cc3955907500c130109e3d3c893..c205129e8054e8b2e8f8e8993d01034129cd383a 100644 (file)
--- a/lib/webhooks/get_module_changes.py
+++ b/lib/webhooks/get_module_changes.py
@@ -20,9 +20,9 @@ from distutils.version import LooseVersion
 # Third party modules
 
 # Own modules
-from . import __version__
+from fb_tools.common import pp
 
-from .common import pp
+from . import __version__
 
 from .base_app import BaseHookError, UncriticalHookError, BaseHookApp
 

diff --git a/lib/webhooks/handler.py b/lib/webhooks/handler.py
index 64040a4c1cb933fd098f0f9ee883cf14be546145..d22b5d8f275ba86dda16c1261a78e7f414d366de 100644 (file)
--- a/lib/webhooks/handler.py
+++ b/lib/webhooks/handler.py
@@ -25,7 +25,7 @@ from fcntl import fcntl, F_GETFL, F_SETFL
 import six
 
 # Own modules
-from .common import caller_search_path
+from fb_tools.common import caller_search_path
 
 from .errors import ReadTimeoutError, WriteTimeoutError
 from .errors import CommandNotFoundError
@@ -33,7 +33,7 @@ from .errors import CommandNotFoundError
 from .obj import BaseObjectError
 from .obj import BaseObject
 
-__version__ = '1.1.0'
+__version__ = '1.2.0'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/lib/webhooks/lock_handler.py b/lib/webhooks/lock_handler.py
index bf5329fd30aeea6c3ca7d3bc23018c7b12cc94dc..657c01d34905626b2b98d415c380ab154309e13b 100644 (file)
--- a/lib/webhooks/lock_handler.py
+++ b/lib/webhooks/lock_handler.py
@@ -25,7 +25,7 @@ from numbers import Number
 from six import reraise
 
 # Own modules
-from .common import to_utf8
+from fb_tools.common import to_utf8
 
 from .errors import CouldntOccupyLockfileError
 
@@ -33,7 +33,7 @@ from .obj import BaseObject
 
 from .handler import BaseHandlerError, BaseHandler
 
-__version__ = '0.3.1'
+__version__ = '0.4.1'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/lib/webhooks/module_info.py b/lib/webhooks/module_info.py
index 003fe61879f7d1d438b58e293f937950d7883c45..eb5a8ee7b3613831dcdf8d7b3b72a090955989db 100644 (file)
--- a/lib/webhooks/module_info.py
+++ b/lib/webhooks/module_info.py
@@ -21,12 +21,12 @@ import requests
 import pytz
 
 # Own modules
-from .common import pp, to_str, to_bool, is_sequence
+from fb_tools.common import pp, to_str, to_bool, is_sequence
 
 from .obj import BaseObjectError
 from .obj import BaseObject
 
-__version__ = '1.0.1'
+__version__ = '1.1.1'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/lib/webhooks/module_list.py b/lib/webhooks/module_list.py
index 3666d0a3aec06ea13b82634b1c4e4a6f4624b072..552031c0016cb0d133f758072080a1554a600f5c 100644 (file)
--- a/lib/webhooks/module_list.py
+++ b/lib/webhooks/module_list.py
@@ -18,12 +18,13 @@ from functools import cmp_to_key
 # Third party modules
 
 # Own modules
+from fb_tools.common import to_bool
+
 from .obj import BaseObject
-from .common import to_bool
 
 from .module_info import ModuleInfo
 
-__version__ = '1.1.0'
+__version__ = '1.2.0'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/lib/webhooks/obj.py b/lib/webhooks/obj.py
index 668834908069ac12e84da1a98a74a89936e2ee0d..30edcc010572170e454dfadde683ca6d1b84fd75 100644 (file)
--- a/lib/webhooks/obj.py
+++ b/lib/webhooks/obj.py
@@ -17,11 +17,11 @@ import traceback
 # Third party modules
 
 # Own modules
-from .common import pp, to_bytes
+from fb_tools.common import pp, to_bytes
 
 from .errors import PpError
 
-__version__ = '1.0.1'
+__version__ = '1.1.1'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/lib/webhooks/r10k.py b/lib/webhooks/r10k.py
index bbc500f0c80b84ebd2e0094f833f4e1b9ed36ebf..3faecce91867f4b057f4a1280e4009aae20e6f43 100644 (file)
--- a/lib/webhooks/r10k.py
+++ b/lib/webhooks/r10k.py
@@ -22,9 +22,9 @@ import warnings
 import requests
 
 # Own modules
-from . import __version__
+from fb_tools.common import to_str
 
-from .common import to_str
+from . import __version__
 
 from .base_app import BaseHookApp
 

diff --git a/lib/webhooks/show_modules.py b/lib/webhooks/show_modules.py
index 829f81e38019cfe16a4a3b7682a7e2502cd5755f..69dde8936979136ca678c948d8812b93daf382a5 100644 (file)
--- a/lib/webhooks/show_modules.py
+++ b/lib/webhooks/show_modules.py
@@ -19,9 +19,9 @@ import re
 # Third party modules
 
 # Own modules
-from . import __version__
+from fb_tools.common import pp, is_sequence
 
-from .common import pp, is_sequence
+from . import __version__
 
 from .base_app import BaseHookError, BaseHookApp, UncriticalHookError
 

diff --git a/requirements.txt b/requirements.txt
index 54becc5351ac2ecd6398d72869e6896011956dc3..58902ea64af34e2114f0ab828bc016efd8270f1f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,4 @@ dnspython
 flake8
 docker-py
 pathlib
-git+https://git.pixelpark.com/frabrehm/python_fb_tools.git@1.2.3
+git+https://git.pixelpark.com/frabrehm/python_fb_tools.git@1.2.4