Merge branch 'change-use-of-ska-logging' into 'master'

Use ska namespace in ska_logging imports

See merge request ska-telescope/lmc-base-classes!17

Pipfile

@@ -18,7 +18,7 @@ pytango = "==9.3.1"
 # 'RUN ipython profile create' line from Dockerfile.
 itango = "*"
 future = "*"
-ska_logging = ">=0.2.0"
+ska_logging = ">=0.3.0"
 
 [dev-packages]
 docutils = "*"

README.md

@@ -25,6 +25,9 @@ The lmc-base-classe repository contains set of eight classes as mentioned in SKA
 
 ## Version History
 
+#### (unreleased)
+- Change ska_logger dependency to use ska-namespaced package (v0.3.0).  No change to usage.
+ 
 #### 0.5.1
 - Make 'ska' a [native namespace package](https://packaging.python.org/guides/packaging-namespace-packages/#native-namespace-packages).
   No change to usage. 

docs/source/conf.py

@@ -27,7 +27,7 @@
 # sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
 autodoc_mock_imports = ['PyTango', 'tango', 'tango.server', 'run', 'command',
-                        'future', 'future.utils', 'ska_logging', 'ska_logging.configuration']
+                        'future', 'future.utils', 'ska.logging', 'ska.logging.configuration']
 
 import sys
 import os

setup.py

@@ -35,7 +35,7 @@ setuptools.setup(
     ],
     platforms=["OS Independent"],
     setup_requires=[] + pytest_runner,
-    install_requires=["future", "ska_logging >= 0.2.0"],
+    install_requires=["future", "ska_logging >= 0.3.0"],
     tests_require=["pytest", "coverage", "pytest-json-report", "pytest-forked"],
     entry_points={
         "console_scripts": [

src/ska/base/base_device.py

@@ -26,7 +26,7 @@ from tango import AttrQuality, AttrWriteType
 from tango import DeviceProxy, DevFailed
 
 # SKA specific imports
-import ska_logging
+import ska.logging as ska_logging
 from . import release
 from .control_model import (
     AdminMode, ControlMode, HealthState, LoggingLevel, SimulationMode, TestMode

tests/test_base_device.py

@@ -77,7 +77,7 @@ class TestLoggingUtils:
     @mock.patch('logging.handlers.SysLogHandler')
     @mock.patch('logging.handlers.RotatingFileHandler')
     @mock.patch('logging.StreamHandler')
-    @mock.patch('ska_logging.get_default_formatter')
+    @mock.patch('ska.logging.get_default_formatter')
     def test_create_logging_handler(self,
                                     mock_get_formatter,
                                     mock_stream_handler,