From fcebe2f2209376c02aa2a7c173080d2e4dbb7d5b Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sat, 12 Feb 2022 23:03:49 +0000 Subject: [PATCH] Rebase dev onto v2_id --- .idea/musicmuster.iml | 4 +++- poetry.lock | 6 +++++- pyproject.toml | 1 + test_models.py | 2 -- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.idea/musicmuster.iml b/.idea/musicmuster.iml index 8b8c395..ca007c7 100644 --- a/.idea/musicmuster.iml +++ b/.idea/musicmuster.iml @@ -1,7 +1,9 @@ - + + + diff --git a/poetry.lock b/poetry.lock index b2ff6a2..89a75f1 100644 --- a/poetry.lock +++ b/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"}, +] diff --git a/pyproject.toml b/pyproject.toml index de1fd51..7dfbf56 100644 --- a/pyproject.toml +++ b/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"] diff --git a/test_models.py b/test_models.py index 6be5f07..d0345b3 100644 --- a/test_models.py +++ b/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"""