Skip to content

Commit e33d8af

Browse files
authored
Formatting + Version + CI Python 3.14 (#70)
Add Python 3.14 CI Format code Roll to 1.2.0
1 parent 9a4f63f commit e33d8af

3 files changed

Lines changed: 19 additions & 7 deletions

File tree

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, windows-latest]
15-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
15+
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
1616
exclude:
1717
- os: ubuntu-latest
1818
python-version: 3.6

doipclient/client.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -760,18 +760,24 @@ def send_diagnostic_to_address(
760760
else:
761761
result = self.read_doip()
762762
if type(result) == DiagnosticMessageNegativeAcknowledgement:
763-
if result.source_address == address and result.target_address == self._client_logical_address:
763+
if (
764+
result.source_address == address
765+
and result.target_address == self._client_logical_address
766+
):
764767
raise IOError(
765768
"Diagnostic request rejected with negative acknowledge code: {}".format(
766769
result.nack_code
767770
)
768771
)
769-
else:
772+
else:
770773
logger.warning(
771774
"Received DiagnosticMessageNegativeAcknowledgement, but source and target addresses don't match expected values. Ignoring."
772775
)
773776
elif type(result) == DiagnosticMessagePositiveAcknowledgement:
774-
if result.source_address == address and result.target_address == self._client_logical_address:
777+
if (
778+
result.source_address == address
779+
and result.target_address == self._client_logical_address
780+
):
775781
return
776782
else:
777783
logger.warning(
@@ -801,9 +807,15 @@ def receive_diagnostic(self, timeout=None):
801807
else:
802808
result = self.read_doip()
803809
if type(result) == DiagnosticMessage:
804-
if result.source_address == self._ecu_logical_address and result.target_address == self._client_logical_address:
810+
if (
811+
result.source_address == self._ecu_logical_address
812+
and result.target_address == self._client_logical_address
813+
):
805814
return result.user_data
806-
elif result.source_address != self._ecu_logical_address and result.target_address == self._client_logical_address:
815+
elif (
816+
result.source_address != self._ecu_logical_address
817+
and result.target_address == self._client_logical_address
818+
):
807819
logger.warning(
808820
"Received DiagnosticMessage with expected target address, but source address doesn't match expected ECU logical address. Ignoring."
809821
)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setuptools.setup(
99
name="doipclient",
10-
version="1.1.8",
10+
version="1.2.0",
1111
description="A Diagnostic over IP (DoIP) client implementing ISO-13400-2.",
1212
long_description=long_description,
1313
long_description_content_type="text/x-rst",

0 commit comments

Comments
 (0)