Merge pull request #116 from lowdef/add_pylama_backin_post_py36

Browse Source 
add pylama back in + fix uniform style issues reported by pylama
This commit is contained in:
Nigel Dokter 2023-01-01 20:36:39 +01:00 committed by GitHub
commit 3a3054324a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dsmr_parser/objects.py
View File

@ -113,6 +113,7 @@ class MBusObject(DSMRObject):
} }
return json.dumps(output) return json.dumps(output)
class MBusObjectPeak(DSMRObject): class MBusObjectPeak(DSMRObject):
@property @property
@ -132,7 +133,9 @@ class MBusObjectPeak(DSMRObject):
return self.values[2]['unit'] return self.values[2]['unit']
def __str__(self): def __str__(self):
output = "{}\t[{}] at {} occurred {}".format(str(self.value), str(self.unit), str(self.datetime.astimezone().isoformat()), str(self.occurred.astimezone().isoformat())) output = "{}\t[{}] at {} occurred {}"\
.format(str(self.value), str(self.unit), str(self.datetime.astimezone().isoformat()),
str(self.occurred.astimezone().isoformat()))
return output return output
def to_json(self): def to_json(self):

8
dsmr_parser/parsers.py
View File

@ -244,10 +244,10 @@ class MaxDemandParser(DSMRObjectParser):
objects = [] objects = []
count = int(values[0]) count = int(values[0])
for i in range(1, count+1): for i in range(1, count + 1):
timestamp_month = ValueParser(timestamp).parse(values[i*3+1]) timestamp_month = ValueParser(timestamp).parse(values[i * 3 + 1])
timestamp_occurred = ValueParser(timestamp).parse(values[i*3+1]) timestamp_occurred = ValueParser(timestamp).parse(values[i * 3 + 1])
value = ValueParser(Decimal).parse(values[i*3+2]) value = ValueParser(Decimal).parse(values[i * 3 + 2])
objects.append(MBusObjectPeak([timestamp_month, timestamp_occurred, value])) objects.append(MBusObjectPeak([timestamp_month, timestamp_occurred, value]))
return objects return objects

1
test/test_parse_fluvius.py
View File

@ -246,7 +246,6 @@ class TelegramParserFluviusTest(unittest.TestCase):
assert isinstance(result[obis.BELGIUM_MBUS2_METER_READING1].value, Decimal) assert isinstance(result[obis.BELGIUM_MBUS2_METER_READING1].value, Decimal)
assert result[obis.BELGIUM_MBUS2_METER_READING1].value == Decimal('872.234') assert result[obis.BELGIUM_MBUS2_METER_READING1].value == Decimal('872.234')
def test_checksum_valid(self): def test_checksum_valid(self):
# No exception is raised. # No exception is raised.
TelegramParser.validate_checksum(TELEGRAM_FLUVIUS_V171) TelegramParser.validate_checksum(TELEGRAM_FLUVIUS_V171)

17
tox.ini
View File

@ -2,8 +2,25 @@
deps= deps=
pytest pytest
pytest-cov pytest-cov
pylama
pytest-asyncio pytest-asyncio
pytest-mock pytest-mock
dlms_cosem dlms_cosem
commands= commands=
py.test --cov=dsmr_parser test {posargs} py.test --cov=dsmr_parser test {posargs}
pylama dsmr_parser test
[pylama:dsmr_parser/clients/__init__.py]
ignore = W0611
[pylama:dsmr_parser/parsers.py]
ignore = W605
[pylama:test/example_telegrams.py]
ignore = E501
[pylama:pylint]
max_line_length = 120
[pylama:pycodestyle]
max_line_length = 120