chellow 1753257333.0.0__py3-none-any.whl → 1753693159.0.0__py3-none-any.whl

chellow/e/dno_rate_parser.py

@@ -426,19 +426,27 @@ def find_rates(file_name, file_like):
 
 
 GSP_MAP = (
+    ("eastern-power-networks-", "_A"),
     ("gsp a", "_A"),
     ("gsp b", "_B"),
     ("gsp c", "_C"),
+    ("lond", "_C"),
     ("gsp d", "_D"),
+    ("spm-", "_D"),
     ("gsp e", "_E"),
+    ("mide", "_E"),
     ("gsp f", "_F"),
+    ("enwl-", "_G"),
     ("gsp g", "_G"),
     ("gsp h", "_H"),
+    ("sepd", "_H"),
     ("gsp j", "_J"),
     ("gsp k", "_K"),
     ("gsp l", "_L"),
+    ("sweb", "_L"),
     ("gsp m", "_M"),
     ("gsp n", "_N"),
+    ("spd", "_N"),
     ("gsp p", "_P"),
     ("gsp_a", "_A"),
     ("gsp_b", "_B"),
@@ -454,11 +462,6 @@ GSP_MAP = (
     ("gsp_m", "_M"),
     ("gsp_n", "_N"),
     ("gsp_p", "_P"),
-    ("lond", "_C"),
-    ("mide", "_E"),
-    ("sepd", "_H"),
-    ("sweb", "_L"),
-    ("spd", "_N"),
 )
 
 

chellow/e/hh_importer.py

@@ -201,7 +201,7 @@ class HhImportTask(threading.Thread):
                     lock.release()
 
     def run(self):
-        while not self.stopped.isSet():
+        while not self.stopped.is_set():
             self.import_now()
             timeout = None if self.is_error else self.wait_seconds
             self.going.wait(timeout=timeout)

chellow/templates/e/dc_auto_importer.html

@@ -25,7 +25,7 @@
 			</tr>
 			<tr>
 				<td>{{task.is_locked()}}</td>
-				<td>{{task.stopped.isSet()}}</td>
+				<td>{{task.stopped.is_set()}}</td>
 			</tr>
 		</table>        
 

{chellow-1753257333.0.0.dist-info → chellow-1753693159.0.0.dist-info}/METADATA

@@ -1,19 +1,19 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1753257333.0.0
+Version: 1753693159.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)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Requires-Dist: flask-restx==1.3.0
 Requires-Dist: flask==3.1.1
 Requires-Dist: jsonschema==4.17.3
 Requires-Dist: odio==0.0.23
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: paramiko==3.4.1
-Requires-Dist: pep3143daemon==0.0.6
+Requires-Dist: pep3143daemon==0.1.0
 Requires-Dist: pg8000==1.31.1
 Requires-Dist: pip>=9.0.1
 Requires-Dist: psutil==5.9.5
@@ -76,7 +76,7 @@ in Windows an environment variable can be set by doing:
 
 `set PGUSER=postgres`
 
-* Install Python 3.9 (tested on the [CPython 3.9.8](http://www.python.org/) interpreter)
+* Install Python 3.11
 * Create a virtual environment: `python3 -m venv venv`
 * Activate the virtual environment: `source venv/bin/activate`
 * Install Chellow: `pip install chellow`

{chellow-1753257333.0.0.dist-info → chellow-1753693159.0.0.dist-info}/RECORD

@@ -22,11 +22,11 @@ chellow/e/bsuos.py,sha256=2L7pgiGbV4k1Udfzjj4B2Qye02sV_FhNjwh7_sIxXFg,15525
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=CWLdYeNjgqT6Ro8YRf4vhwXIAJ2aV4Wi6HLNClVSeaQ,14260
 chellow/e/computer.py,sha256=lt4Zlr8EOClL1acuuvKA-tNPCI5RRHnAZbsaGQnB9j4,68835
-chellow/e/dno_rate_parser.py,sha256=psJBBYHsZp1eQcrCyzPv7Tqo_AFhD5bneZSGpaQxDKs,21795
+chellow/e/dno_rate_parser.py,sha256=EO3uIYD0uiT8uumI5wnODMsFwYGrdB5HexuOu-2aFkw,21875
 chellow/e/duos.py,sha256=RHrn93I1ASO2uYkuF18qlhG4p-jpuJhd_g3o69wtP4U,31004
 chellow/e/elexon.py,sha256=eOmX_wpxj6Ty6eaEgGAgXX-MgyJkYQSAT6DtJeP1rUE,5544
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
-chellow/e/hh_importer.py,sha256=adfogJgPWsJurPOVSBLLQ7m68s1LhfQmDYpAFnGm0eM,21510
+chellow/e/hh_importer.py,sha256=JBVCNSpM-DMu9_io516KojvujwZEQq6upDSsMbtu_sI,21511
 chellow/e/hh_parser_bg_csv.py,sha256=W5SU2MSpa8BGA0VJw1JXF-IwbCNLFy8fe35yxLZ7gEw,2453
 chellow/e/hh_parser_df2.py,sha256=nZT198EZWo_G26IfJZncI_kOo-UdsXzFYDmDf3qyEs8,5089
 chellow/e/hh_parser_edf_csv.py,sha256=CLkkL1Z6BPgVV_3uwS6McmtMzgXkoEIoJnH8FsQk1C8,2839
@@ -192,7 +192,7 @@ chellow/templates/e/csv_sites_triad.html,sha256=Btlx3P3L-ACYo6FjOky5s3a_pAlMyUe_
 chellow/templates/e/csv_supplies_hh_data.html,sha256=IQxLdEDKROsobIOvyp4lBm1c_GlnagjLuNHOSzgPGII,1701
 chellow/templates/e/csv_supplies_snapshot.html,sha256=6F1UL7TUH-yE3qYJulsLX7qca-gUhTye56n6xXWgpF8,748
 chellow/templates/e/csv_supplies_triad.html,sha256=4ppGGWuUNlTPXdBvK_-O55WCHwVniKYpGY34K0LLEK0,422
-chellow/templates/e/dc_auto_importer.html,sha256=sVQIFLIyJvuh9sFU3xuQ-Vl_49TjP5FWw5UAX9QnG6s,1165
+chellow/templates/e/dc_auto_importer.html,sha256=pUTQkrcNZLAo_ttFPwG0kyHZ-VCKSonsnwHjw_kkWhU,1166
 chellow/templates/e/dc_batch.html,sha256=Q3HKAE_gV8X5HGxsU5Yg5exmGhojMJ2P3PrA4m4Gbio,4795
 chellow/templates/e/dc_batch_add.html,sha256=SjNP-5pS4u_UgSKfoSJsoog9yFRP9obbzbu7zK64x_w,1113
 chellow/templates/e/dc_batch_edit.html,sha256=S8Btt7Eg2BUcOshqyfVkmNzehne9doYVbK93iTEvP6g,1962
@@ -385,6 +385,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1753257333.0.0.dist-info/METADATA,sha256=-Ap3LiI6IQUf4wShS13GeZg2nzWVwHSSXz5uqPcpaEE,12585
-chellow-1753257333.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1753257333.0.0.dist-info/RECORD,,
+chellow-1753693159.0.0.dist-info/METADATA,sha256=UsVoaoytahijKr86LEQtg06Dq9SRjBRqWMsl9Qv7UvM,12519
+chellow-1753693159.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1753693159.0.0.dist-info/RECORD,,