Preparing release 0.26

Merge pull request #68 from ndokter/revert-57-master
Revert "fix for empty parentheses in ProfileGenericParser"
2020-12-15 15:03:22 +01:00 · 2020-12-15 15:00:07 +01:00 · 2020-12-15 14:59:35 +01:00 · 2020-12-14 17:21:16 +01:00 · 2020-12-14 17:16:55 +01:00 · 2020-12-14 16:55:38 +01:00
3 changed files with 12 additions and 2 deletions
@@ -1,6 +1,12 @@
 Change Log
 ----------

+**0.26** (2020-12-15)
+- reverted fix for empty parentheses in ProfileGenericParser (`pull request #68 <https://github.com/ndokter/dsmr_parser/pull/68>`_).
+
+**0.25** (2020-12-14)
+- fix for empty parentheses in ProfileGenericParser (`pull request #57 <https://github.com/ndokter/dsmr_parser/pull/57>`_).
+
 **0.24** (2020-11-27)
 - Add Luxembourg equipment identifier (`pull request #62 <https://github.com/ndokter/dsmr_parser/pull/62>`_).

@@ -48,7 +48,11 @@ EN = {
    obis.GAS_METER_READING: 'GAS_METER_READING',
    obis.ACTUAL_TRESHOLD_ELECTRICITY: 'ACTUAL_TRESHOLD_ELECTRICITY',
    obis.ACTUAL_SWITCH_POSITION: 'ACTUAL_SWITCH_POSITION',
-    obis.VALVE_POSITION_GAS: 'VALVE_POSITION_GAS'
+    obis.VALVE_POSITION_GAS: 'VALVE_POSITION_GAS',
+    obis.BELGIUM_HOURLY_GAS_METER_READING: 'BELGIUM_HOURLY_GAS_METER_READING',
+    obis.LUXEMBOURG_EQUIPMENT_IDENTIFIER: 'LUXEMBOURG_EQUIPMENT_IDENTIFIER',
+    obis.LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL: 'LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL',
+    obis.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL: 'LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL'
 }

 REVERSE_EN = dict([(v, k) for k, v in EN.items()])
@@ -6,7 +6,7 @@ setup(
    author='Nigel Dokter',
    author_email='nigel@nldr.net',
    url='https://github.com/ndokter/dsmr_parser',
-    version='0.24',
+    version='0.26',
    packages=find_packages(exclude=('test', 'test.*')),
    install_requires=[
        'pyserial>=3,<4',
Author	SHA1	Message	Date
Nigel	feb0f88ddc	Preparing release 0.26	2020-12-15 15:03:22 +01:00
Nigel	602129a665	Merge pull request #68 from ndokter/revert-57-master Revert "fix for empty parentheses in ProfileGenericParser"	2020-12-15 15:00:07 +01:00
Nigel	af9a99d995	Revert "fix for empty parentheses in ProfileGenericParser"	2020-12-15 14:59:35 +01:00
Nigel	a7b4929eab	preparation for v0.25	2020-12-14 17:21:16 +01:00
Nigel	8999b1c924	Merge branch 'master' of github.com:ndokter/dsmr_parser	2020-12-14 17:16:55 +01:00
Nigel	2391f38c4a	Merge pull request #57 from avandermeer/master fix for empty parentheses in ProfileGenericParser	2020-12-14 16:55:38 +01:00
Nigel	d1a6e15c68	Merge pull request #66 from GuyFoetz/foreign_name_mapping adding the # Alternate codes for foreign countries.	2020-12-13 13:22:15 +01:00
Guy Foetz	b7c8626d0c	adding the # Alternate codes for foreign countries.	2020-12-13 12:15:51 +00:00
albert	dc902a83e9	referring to parent method from _parse_values in ProfileGenericParser	2020-09-08 12:30:51 +02:00
albert	be4386bc59	tempfix for empty profileGenericParser	2020-09-07 18:15:49 +02:00