From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 6 Dec 2018 17:01:53 +0000 (+0100)
Subject: Switching from own common.py to fb_tools.common
X-Git-Tag: 1.6.4^2~110
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=3062439b513a34da7f1c9a154331c2587855e1f6;p=pixelpark%2Fpuppetmaster-webhooks.git

Switching from own common.py to fb_tools.common
---

diff --git a/lib/webhooks/base_app.py b/lib/webhooks/base_app.py
index c7575ca..16de573 100644
--- 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 d20ed8e..b3ff417 100644
--- 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 8783409..80d148e 100644
--- 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 e62d9fc..c205129 100644
--- 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 64040a4..d22b5d8 100644
--- 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 bf5329f..657c01d 100644
--- 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 003fe61..eb5a8ee 100644
--- 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 3666d0a..552031c 100644
--- 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 6688349..30edcc0 100644
--- 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 bbc500f..3faecce 100644
--- 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 829f81e..69dde89 100644
--- 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 54becc5..58902ea 100644
--- 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