Merge branch 'v3.2.1_pick'

Author: janiversen

CHANGELOG.rst

@@ -1,3 +1,15 @@
+version 3.2.1 (picked from dev, only bugfixes)
+----------------------------------------------------------
+* add missing server.start(). (#1443)
+* Don't publish univeral (Python2 / Python 3) wheels (#1423)
+* Remove unneccesary custom LOG_LEVEL check (#1424)
+* Include py.typed in package (#1422)
+
+Thanks to:
+  Alex,
+  jan iversen,
+  Thijs W
+
 version 3.2.0
 ----------------------------------------------------------
 * Add value <-> registers converter helpers. (#1413)

MAKE_RELEASE.rst

@@ -28,7 +28,7 @@ Prepare/make release on dev.
 * on local repo
    * git pull, check release tag is pulled
    * git checkout v3.0.0dev0
-   * python3 setup.py sdist bdist_wheel --universal
+   * python3 setup.py sdist bdist_wheel
    * twine upload dist/*  (upload to pypi)
    * Double check Read me docs are updated
       * trigger build https://readthedocs.org/projects/pymodbus/builds/

pymodbus/logging.py

@@ -35,7 +35,6 @@ class Log:
     :meta private:
     """
 
-    LOG_LEVEL = logging.NOTSET
     _logger = logging.getLogger(__name__)
 
     @classmethod
@@ -59,7 +58,6 @@ def apply_logging_config(cls, level, log_file_name):
     def setLevel(cls, level):
         """Apply basic logging level"""
         cls._logger.setLevel(level)
-        cls.LOG_LEVEL = level
 
     @classmethod
     def build_msg(cls, txt, *args):
@@ -90,39 +88,29 @@ def build_msg(cls, txt, *args):
     @classmethod
     def info(cls, txt, *args):
         """Log info messagees."""
-        if cls.LOG_LEVEL == logging.NOTSET:
-            cls.LOG_LEVEL = cls._logger.getEffectiveLevel()
-        if logging.INFO >= cls.LOG_LEVEL:
+        if cls._logger.isEnabledFor(logging.INFO):
             cls._logger.info(cls.build_msg(txt, *args))
 
     @classmethod
     def debug(cls, txt, *args):
         """Log debug messagees."""
-        if cls.LOG_LEVEL == logging.NOTSET:
-            cls.LOG_LEVEL = cls._logger.getEffectiveLevel()
-        if logging.DEBUG >= cls.LOG_LEVEL:
+        if cls._logger.isEnabledFor(logging.DEBUG):
             cls._logger.debug(cls.build_msg(txt, *args))
 
     @classmethod
     def warning(cls, txt, *args):
         """Log warning messagees."""
-        if cls.LOG_LEVEL == logging.NOTSET:
-            cls.LOG_LEVEL = cls._logger.getEffectiveLevel()
-        if logging.WARNING >= cls.LOG_LEVEL:
+        if cls._logger.isEnabledFor(logging.WARNING):
             cls._logger.warning(cls.build_msg(txt, *args))
 
     @classmethod
     def error(cls, txt, *args):
         """Log error messagees."""
-        if cls.LOG_LEVEL == logging.NOTSET:
-            cls.LOG_LEVEL = cls._logger.getEffectiveLevel()
-        if logging.ERROR >= cls.LOG_LEVEL:
+        if cls._logger.isEnabledFor(logging.ERROR):
             cls._logger.error(cls.build_msg(txt, *args))
 
     @classmethod
     def critical(cls, txt, *args):
         """Log critical messagees."""
-        if cls.LOG_LEVEL == logging.NOTSET:
-            cls.LOG_LEVEL = cls._logger.getEffectiveLevel()
-        if logging.CRITICAL >= cls.LOG_LEVEL:
+        if cls._logger.isEnabledFor(logging.CRITICAL):
             cls._logger.critical(cls.build_msg(txt, *args))

pymodbus/server/async_io.py

@@ -1221,6 +1221,7 @@ async def StartAsyncSerialServer(  # pylint: disable=invalid-name,dangerous-defa
     server = ModbusSerialServer(
         context, kwargs.pop("framer", ModbusAsciiFramer), identity=identity, **kwargs
     )
+    server.start()
     await _serverList.run(server, custom_functions)
 
 

pymodbus/version.py

@@ -37,4 +37,4 @@ def __str__(self) -> str:
         return f"[{self.package}, version {self.short()}]"
 
 
-version = Version("pymodbus", 3, 2, 0, "")
+version = Version("pymodbus", 3, 2, 1, "")

setup.cfg

@@ -543,7 +543,6 @@ upload_dir = build/sphinx/html
 
 
 [bdist_wheel]
-universal=1
 
 
 [tool:pytest]

setup.py

@@ -30,4 +30,5 @@
 setup(
     install_requires=install_req,
     extras_require=dependencies,
+    package_data={"pymodbus": ["py.typed"]},
 )

test/test_logging.py

@@ -1,35 +1,25 @@
 """Test datastore."""
 import logging
+from unittest.mock import patch
 
 import pytest
 
-from pymodbus import pymodbus_apply_logging_config
 from pymodbus.logging import Log
 
 
 class TestLogging:
     """Tests of pymodbus logging."""
 
-    def test_log_our_default(self):
-        """Test default logging"""
-        logging.getLogger().setLevel(logging.WARNING)
-        Log.setLevel(logging.NOTSET)
-        Log.info("test")
-        assert Log.LOG_LEVEL == logging.WARNING
-        Log.setLevel(logging.NOTSET)
-        logging.getLogger().setLevel(logging.INFO)
-        Log.info("test")
-        assert Log.LOG_LEVEL == logging.INFO
-        Log.setLevel(logging.NOTSET)
-        pymodbus_apply_logging_config()
-        assert Log.LOG_LEVEL == logging.DEBUG
-
-    def test_log_set_level(self):
-        """Test default logging"""
-        pymodbus_apply_logging_config(logging.DEBUG)
-        assert Log.LOG_LEVEL == logging.DEBUG
-        pymodbus_apply_logging_config(logging.INFO)
-        assert Log.LOG_LEVEL == logging.INFO
+    def test_log_dont_call_build_msg(self):
+        """Verify that build_msg is not called unnecessary"""
+        with patch("pymodbus.logging.Log.build_msg") as build_msg_mock:
+            Log.setLevel(logging.INFO)
+            Log.debug("test")
+            build_msg_mock.assert_not_called()
+
+            Log.setLevel(logging.DEBUG)
+            Log.debug("test2")
+            build_msg_mock.assert_called_once()
 
     def test_log_simple(self):
         """Test simple string"""