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/setup.py
+++ b/setup.py
@@ -6,13 +6,12 @@ setup(
    author='Nigel Dokter',
    author_email='nigel@nldr.net',
    url='https://github.com/ndokter/dsmr_parser',
-    version='0.17',
+    version='0.19',
    packages=find_packages(),
    install_requires=[
        'pyserial>=3,<4',
        'pyserial-asyncio<1',
        'pytz',
-        'PyCRC>=1.2,<2',
        'Tailer==0.4.1'
    ],
    entry_points={