Fix CI and tooling

Author: JanPetterMG

README.md

@@ -90,7 +90,7 @@ Some additional Python packages are needed, most notabily `python-dotenv` which
 To install all dependencies, run the following command from the IDE terminal:
 
 ```bash
-pip install -r tools/requirements.txt
+pip install ./tools
 ```
 
 ## 🏗️ Configuration

scripts/preBuild.py

@@ -4,6 +4,7 @@
 
 Import("env")  # type: ignore
 sys.path.insert(0, env["PROJECT_DIR"])  # type: ignore
+env.Execute(f"cd tools && pip install --quiet .")  # type: ignore
 
 from tools.src.Firmware import Firmware
 from tools.src.Tools import Tools

tools/project.toml tools/pyproject.tomltools/project.toml renamed to tools/pyproject.toml

@@ -2,8 +2,15 @@
 name = "frekvens"
 description = "Toolbox for the Frekvens ESP32 project."
 version = "1.0.0"
-license = { file = "../LICENSE" }
-readme = "../README.md"
+license = "MIT"
+requires-python = ">=3.11"
+dependencies = [
+    'argparse >= 1.4.0, < 2',
+    'python-dotenv >= 1.1.0, < 2',
+    'requests >= 2.32.4, < 3',
+    'requests-toolbelt >= 1.0.0, < 2',
+    'tqdm >= 4.67.1, < 5',
+]
 
 [project.urls]
 "Homepage" = "https://github.com/VIPnytt/Frekvens"

tools/requirements.txt

@@ -7,14 +7,11 @@
 
 from tools.src.config import Frekvens
 from tools.src.config import Obegransad
-from tools.src.Tools import Tools
 
 
 class Firmware:
     def __init__(self, env):
         self.env = env
-        tools = Tools(env)  # type: ignore
-        tools.check()
 
     def define(self):
         env_pio = dotenv.dotenv_values(".env")

tools/src/Firmware.py

@@ -1,50 +1,12 @@
 import dotenv
-import importlib.metadata
 import json
 import re
-import subprocess
-import sys
+
 
 
 class Tools:
     def __init__(self, env):
         self.env = env
-        self.check()
-
-    def check(self):
-        requirements_txt_path = "tools/requirements.txt"
-
-        with open(requirements_txt_path) as txt:
-
-            for requirement in txt:
-
-                requirement = requirement.strip()
-                if not requirement or requirement.startswith("#"):
-                    continue
-                package = (
-                    requirement.split(";")[0]
-                    .split("==")[0]
-                    .split(">=")[0]
-                    .split("<=")[0]
-                    .split(">")[0]
-                    .split("<")[0]
-                    .strip()
-                )
-                if package:
-                    try:
-                        importlib.metadata.version(package)
-                    except importlib.metadata.PackageNotFoundError:
-                        subprocess.check_call(
-                            [
-                                sys.executable,
-                                "-m",
-                                "pip",
-                                "install",
-                                "--quiet",
-                                "-r",
-                                requirements_txt_path,
-                            ]
-                        )
 
     def environment(self):
         env_py_path = "tools/.env"
@@ -79,7 +41,8 @@ def environment(self):
             print(env_py_path)
 
     def version(self):
-        with open("library.json") as pio, open("tools/project.toml", "r+") as toml:
+        config = "tools/pyproject.toml"
+        with open("library.json") as pio, open(config, "r+") as toml:
             library = json.load(pio)
             if "version" in library:
                 lines = toml.readlines()
@@ -91,5 +54,5 @@ def version(self):
                         lines[i] = f'version = "{library["version"]}"\n'
                         toml.seek(0)
                         toml.writelines(lines)
-                        print("tools/project.toml")
+                        print(config)
                         break

tools/src/Tools.py

@@ -7,15 +7,11 @@
 import subprocess
 import sys
 
-from tools.src.Tools import Tools
-
 
 class WebApp:
     def __init__(self, env):
         self.env = env
         self.check()
-        tools = Tools(env)  # type: ignore
-        tools.check()
 
     def build(self):
         with open("library.json") as pio, open("webapp/package.json") as npm, open(