chellow 1753430805.0.0__tar.gz → 1753706177.0.0__tar.gz

{chellow-1753430805.0.0 → chellow-1753706177.0.0}/.github/workflows/chellow.yml

@@ -10,7 +10,7 @@ jobs:
   # Label of the container job
   test:
     runs-on: ubuntu-latest
-    container: python:3.9
+    container: python:3.11
 
     services:
       postgres:
@@ -38,7 +38,7 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
-    container: python:3.9
+    container: python:3.11
     needs: test
     steps:
     - uses: actions/checkout@v4

{chellow-1753430805.0.0 → chellow-1753706177.0.0}/PKG-INFO

@@ -1,19 +1,19 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1753430805.0.0
+Version: 1753706177.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-1753430805.0.0 → chellow-1753706177.0.0}/README.md

@@ -46,7 +46,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-1753706177.0.0/VERSION

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

{chellow-1753430805.0.0 → chellow-1753706177.0.0}/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-1753430805.0.0 → chellow-1753706177.0.0}/chellow/e/tlms.py

@@ -148,13 +148,7 @@ def elexon_import(sess, log, set_progress, s, scripting_key):
 
             set_progress(values[0])
 
-            if values[3] == "":
-                for zone in GSP_GROUP_LOOKUP.keys():
-                    values[3] = zone
-                    _process_line(
-                        cache, sess, contract, log, values, complete_date, caches
-                    )
-            else:
+            if len(values) > 5:
                 _process_line(cache, sess, contract, log, values, complete_date, caches)
 
         for rscript in cache["rate_scripts"]:

{chellow-1753430805.0.0 → chellow-1753706177.0.0}/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-1753706177.0.0/pyproject.toml

@@ -0,0 +1,77 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "chellow"
+dynamic = ["version"]
+description = "Web Application for checking UK energy bills."
+readme = "README.md"
+requires-python = ">=3.11"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+	"odio==0.0.23",
+	"pypdf==4.3.1",
+	"pg8000==1.31.1",
+	"Flask==3.1.1",
+	"SQLAlchemy==2.0.41",
+	"flask-restx==1.3.0",
+  "jsonschema==4.17.3",  # Temporarily needed until RestX updated
+	"openpyxl==3.1.5",
+	"python-dateutil==2.8.2",
+	"pytz==2022.6",
+	"requests==2.32.4",
+	"waitress==3.0.1",
+	"pep3143daemon==0.1.0",
+	"pip>=9.0.1",
+	"paramiko==3.4.1",
+	"pympler==1.0.1",
+	"psutil==5.9.5",
+	"xlrd==2.0.1",
+	"zish==0.1.12",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/WessexWater/chellow"
+
+[tool.hatch.version]
+path = "VERSION"
+
+[tool.tox]
+requires = ["tox>=4.19"]
+envlist = ["py"]
+
+[tool.tox.env_run_base]
+description = "Run test under {base_python}"
+passenv = ["PGPORT", "PGUSER", "PGHOST", "PGPASSWORD"]
+allowlist_externals = ["echo", "rm"]
+commands = [
+    ["black", "--check", "."],
+    ["flake8", "."],
+    ["validate-pyproject", "pyproject.toml"],
+    ["echo", "PGPORT is {env:PGPORT:unset}"],
+    ["echo", "PGUSER is {env:PGUSER:unset}"],
+    ["echo", "Test database is {env:PGDATABASE:unset} on {env:PGHOST:unset}"],
+    ["python", "-m", "pytest", "-v", "-x", "-W error", "test"],
+    ["rm", "-rf", "dist"],
+    ["python", "-m", "build"],
+    ["twine", "check", "dist/*"],
+]
+deps = [
+    "black",
+    "build",
+    "pytest",
+    "pytest-mock",
+    "pytest-benchmark",
+    "flake8",
+    "flake8-alphabetize",
+    "Flake8-pyproject",
+    "twine",
+    "validate-pyproject",
+]
+[tool.tox.env_run_base.setenv]
+PGDATABASE = "toxchellow"

chellow-1753430805.0.0/VERSION

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

chellow-1753430805.0.0/pyproject.toml

@@ -1,72 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "chellow"
-dynamic = ["version"]
-description = "Web Application for checking UK energy bills."
-readme = "README.md"
-requires-python = ">=3.9"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-    "Operating System :: OS Independent",
-]
-dependencies = [
-	"odio==0.0.23",
-	"pypdf==4.3.1",
-	"pg8000==1.31.1",
-	"Flask==3.1.1",
-	"SQLAlchemy==2.0.41",
-	"flask-restx==1.3.0",
-  "jsonschema==4.17.3",  # Temporarily needed until RestX updated
-	"openpyxl==3.1.5",
-	"python-dateutil==2.8.2",
-	"pytz==2022.6",
-	"requests==2.32.4",
-	"waitress==3.0.1",
-	"pep3143daemon==0.0.6",
-	"pip>=9.0.1",
-	"paramiko==3.4.1",
-	"pympler==1.0.1",
-	"psutil==5.9.5",
-	"xlrd==2.0.1",
-	"zish==0.1.12",
-]
-
-[project.urls]
-"Homepage" = "https://github.com/WessexWater/chellow"
-
-[tool.hatch.version]
-path = "VERSION"
-
-[tool.tox]
-legacy_tox_ini = """
-[tox]
-
-[testenv]
-recreate = True
-deps =
-    flake8
-    flake8-alphabetize
-    black
-    pytest
-    pytest-mock
-allowlist_externals =
-    echo
-passenv =
-    PGPORT
-    PGUSER
-    PGHOST
-    PGPASSWORD
-setenv =
-    PGDATABASE = toxchellow
-commands =
-    black --check .
-    flake8 .
-    pytest --exitfirst -W error
-    echo PGPORT is {env:PGPORT:unset}
-    echo PGUSER is {env:PGUSER:unset}
-    echo Test database is {env:PGDATABASE:unset} on {env:PGHOST:unset}
-"""