merged upstream 0.18 version and resolved conflict

2020-02-02 17:26:47 +01:00
parent 0675a6e2e7
commit fee3f696c4
4 changed files with 34 additions and 5 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,6 @@ deps=
  pytest-asyncio
  pytest-catchlog
  pytest-mock
-  PyCRC
 commands=
  py.test --cov=dsmr_parser test {posargs}
  pylama dsmr_parser test