chellow 1755598989.0.0__tar.gz → 1757320031.0.0__tar.gz

{chellow-1755598989.0.0 → chellow-1757320031.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1755598989.0.0
+Version: 1757320031.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1757320031.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1757320031.0.0"

{chellow-1755598989.0.0 → chellow-1757320031.0.0}/chellow/e/bill_parsers/drax_edi.py

@@ -33,6 +33,7 @@ ELEMENT_MAP = {
             "064305": ("fit-gbp", None, None),
             "590346": ("cfd-operational-gbp", None, None),
             "637050": ("meter-rental-gbp", "meter-rental-rate", "meter-rental-days"),
+            "493988": ("reconciliation-gbp", None, None),
         },
     },
     "BUS": {

{chellow-1755598989.0.0 → chellow-1757320031.0.0}/chellow/gas/bill_parser_bgs_xlsx.py

@@ -131,11 +131,11 @@ ELEMENT_LOOKUP = {
     "Gas": "admin_variable",
     "Management Fee": "admin_variable",
     "Metering and Data": "metering",
-    "LDZ Customer Capacity": "dn_customer_capacity_fixed",
+    "LDZ Customer Capacity": "dn_customer_capacity",
     "LDZ Customer Fixed": "dn_customer_fixed",
-    "LDZ System Capacity": "dn_system_capacity_fixed",
+    "LDZ System Capacity": "dn_system_capacity",
     "LDZ System Commodity": "dn_system_commodity",
-    "NTS Exit Capacity (ECN)": "dn_ecn_fixed",
+    "NTS Exit Capacity (ECN)": "dn_ecn",
     "NTS SO Exit": "so_exit_commodity",
     "NTS TO Exit": "to_exit_commodity",
     "Unidentified Gas": "ug",

{chellow-1755598989.0.0 → chellow-1757320031.0.0}/chellow/gas/transportation.py

@@ -1,16 +1,4 @@
 def vb(ds):
-    to_exit_commodity_rate_set = ds.rate_sets["to_exit_commodity_rate"]
-    so_exit_commodity_rate_set = ds.rate_sets["so_exit_commodity_rate"]
-    dn_system_commodity_rate_set = ds.rate_sets["dn_system_commodity_rate"]
-    dn_system_capacity_rate_set = ds.rate_sets["dn_system_capacity_rate"]
-    dn_system_capacity_fixed_rate_set = ds.rate_sets["dn_system_capacity_fixed_rate"]
-    dn_customer_capacity_rate_set = ds.rate_sets["dn_customer_capacity_rate"]
-    dn_customer_capacity_fixed_rate_set = ds.rate_sets[
-        "dn_customer_capacity_fixed_rate"
-    ]
-    dn_customer_fixed_rate_set = ds.rate_sets["dn_customer_fixed_rate"]
-    dn_ecn_rate_set = ds.rate_sets["dn_ecn_rate"]
-    dn_ecn_fixed_rate_set = ds.rate_sets["dn_ecn_fixed_rate"]
 
     for hh in ds.hh_data:
         start_date = hh["start_date"]
@@ -19,11 +7,9 @@ def vb(ds):
         nts_rates = ds.g_industry_rates("nts_commodity", start_date)
 
         to_exit_commodity_rate = float(nts_rates["to_exit_gbp_per_kwh"])
-        to_exit_commodity_rate_set.add(to_exit_commodity_rate)
         hh["to_exit_commodity_rate"] = to_exit_commodity_rate
 
         so_exit_commodity_rate = float(nts_rates["so_exit_gbp_per_kwh"])
-        so_exit_commodity_rate_set.add(so_exit_commodity_rate)
         hh["so_exit_commodity_rate"] = so_exit_commodity_rate
 
         rates = ds.g_industry_rates("dn", start_date)
@@ -89,24 +75,18 @@ def vb(ds):
 
             dn_customer_fixed_rate = 0
 
-        dn_system_commodity_rate_set.add(dn_system_commodity_rate)
         hh["dn_system_commodity_rate"] = dn_system_commodity_rate
 
-        dn_system_capacity_rate_set.add(dn_system_capacity_rate)
         hh["dn_system_capacity_rate"] = dn_system_capacity_rate
 
         dn_system_capacity_fixed_rate = soq * dn_system_capacity_rate
-        dn_system_capacity_fixed_rate_set.add(dn_system_capacity_fixed_rate)
         hh["dn_system_capacity_fixed_rate"] = dn_system_capacity_fixed_rate
 
-        dn_customer_capacity_rate_set.add(dn_customer_capacity_rate)
         hh["dn_customer_capacity_rate"] = dn_customer_capacity_rate
 
         dn_customer_capacity_fixed_rate = soq * dn_customer_capacity_rate
-        dn_customer_capacity_fixed_rate_set.add(dn_customer_capacity_fixed_rate)
         hh["dn_customer_capacity_fixed_rate"] = dn_customer_capacity_fixed_rate
 
-        dn_customer_fixed_rate_set.add(dn_customer_fixed_rate)
         hh["dn_customer_fixed_rate"] = dn_customer_fixed_rate
 
         dn_ecn_rate = float(
@@ -114,9 +94,7 @@ def vb(ds):
                 "exit_capacity_gbp_per_kwh_per_day"
             ]
         )
-        dn_ecn_rate_set.add(dn_ecn_rate)
         hh["dn_ecn_rate"] = dn_ecn_rate
 
         dn_ecn_fixed_rate = dn_ecn_rate * soq
-        dn_ecn_fixed_rate_set.add(dn_ecn_fixed_rate)
         hh["dn_ecn_fixed_rate"] = dn_ecn_fixed_rate

{chellow-1755598989.0.0 → chellow-1757320031.0.0}/pyproject.toml

@@ -75,3 +75,10 @@ deps = [
 ]
 [tool.tox.env_run_base.setenv]
 PGDATABASE = "toxchellow"
+
+[tool.flake8]
+application-names = ["chellow"]
+ignore = ["E203", "W503"]
+max-line-length = 88
+exclude = [".git", "__pycache__", "build", "dist", "venv", ".tox"]
+application-import-names = ["chellow"]

chellow-1755598989.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1755598989.0.0"

chellow-1755598989.0.0/setup.cfg

@@ -1,6 +0,0 @@
-[flake8]
-exclude = venv,.tox,build
-ignore = E203,W503
-max-line-length = 88
-application-names = chellow
-application-import-names = chellow