Rebase dev onto v2_id

.idea/musicmuster.iml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

poetry.lock

@@ -461,7 +461,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 name = "tomli"
 version = "2.0.1"
 description = "A lil' TOML parser"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 
@@ -902,3 +902,7 @@ wcwidth = [
     {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
     {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
 ]
+typing-extensions = [
+    {file = "typing_extensions-4.1.0-py3-none-any.whl", hash = "sha256:c13180fbaa7cd97065a4915ceba012bdb31dc34743e63ddee16360161d358414"},
+    {file = "typing_extensions-4.1.0.tar.gz", hash = "sha256:ba97c5143e5bb067b57793c726dd857b1671d4b02ced273ca0538e71ff009095"},
+]

pyproject.toml

@@ -22,6 +22,7 @@ PyQt5-sip = "^12.9.1"
 mypy = "^0.931"
 pytest = "^7.0.0"
 ipdb = "^0.13.9"
+mypy = "^0.931"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

test_models.py

@@ -1,6 +1,5 @@
 import time
 
-
 from app.models import (
     NoteColours,
     Notes,
@@ -10,7 +9,6 @@ from app.models import (
     Tracks,
 )
 
-
 def test_notecolours_get_colour(session):
     """Create a colour record and retrieve all colours"""