Roll version to 1.7.0

Reformat

Author: jacobschaer

doipclient/client.py

@@ -166,7 +166,7 @@ def __init__(
         client_ip_address=None,
         use_secure=False,
         auto_reconnect_tcp=False,
-        vm_specific=None
+        vm_specific=None,
     ):
         self._ecu_logical_address = ecu_logical_address
         self._client_logical_address = client_logical_address
@@ -594,7 +594,11 @@ def request_activation(
         message = RoutingActivationRequest(
             self._client_logical_address,
             activation_type,
-            vm_specific=self._validate_vm_specific_value(vm_specific) if vm_specific else self.vm_specific,
+            vm_specific=(
+                self._validate_vm_specific_value(vm_specific)
+                if vm_specific
+                else self.vm_specific
+            ),
         )
         self.send_doip_message(message, disable_retry=disable_retry)
         while True:
@@ -843,7 +847,7 @@ def _validate_vm_specific_value(value):
         """
         if not isinstance(value, int) and value is not None:
             raise ValueError("Invalid vm_specific type must be int or None")
-        if isinstance(value, int) and (value < 0 or value > 0xffffffff):
+        if isinstance(value, int) and (value < 0 or value > 0xFFFFFFFF):
             raise ValueError("Invalid vm_specific value must be > 0 and <= 0xffffffff")
         return value
 

setup.py

@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="doipclient",
-    version="1.1.7.dev1",
+    version="1.1.7",
     description="A Diagnostic over IP (DoIP) client implementing ISO-13400-2.",
     long_description=long_description,
     long_description_content_type="text/x-rst",

tests/test_client.py

@@ -754,7 +754,16 @@ def test_use_secure_with_external_ssl_context(mock_socket, mocker):
 
 @pytest.mark.parametrize(
     "vm_specific, exc",
-    ((None, False), (0, False), (-1, True), (0xFFFFFFFF, False), (0x100000000, True), ("0x1", True), (10.0, True)))
+    (
+        (None, False),
+        (0, False),
+        (-1, True),
+        (0xFFFFFFFF, False),
+        (0x100000000, True),
+        ("0x1", True),
+        (10.0, True),
+    ),
+)
 def test_vm_specific_setter(mock_socket, mocker, vm_specific, exc):
     sut = DoIPClient(test_ip, test_logical_address, auto_reconnect_tcp=True)
     if exc:
@@ -776,7 +785,9 @@ def test_vm_specific_static_value(mock_socket, mocker):
         activation_type=None,
         vm_specific=0x01020304,
     )
-    sut.request_activation(activation_type=RoutingActivationRequest.ActivationType.Default)
+    sut.request_activation(
+        activation_type=RoutingActivationRequest.ActivationType.Default
+    )
     assert mock_socket.tx_queue[-1] == activation_request_with_vm
     assert request_activation_spy.call_count == 1
 
@@ -793,7 +804,10 @@ def test_vm_specific_request_activation_bad_value(mock_socket, mocker):
         vm_specific=0x01020304,
     )
     with pytest.raises(ValueError):
-        sut.request_activation(activation_type=RoutingActivationRequest.ActivationType.Default, vm_specific=-1)
+        sut.request_activation(
+            activation_type=RoutingActivationRequest.ActivationType.Default,
+            vm_specific=-1,
+        )
 
 
 def test_vm_specific_verification_in_init(mock_socket, mocker):
@@ -806,4 +820,4 @@ def test_vm_specific_verification_in_init(mock_socket, mocker):
             auto_reconnect_tcp=True,
             activation_type=None,
             vm_specific=-1,
-        )
+        )