Merge branch 'main' of https://github.com/RolnickLab/ami-data-manager …

…into feat/web-api

.gitignore

@@ -139,6 +139,6 @@ trapdata.ini
 # Docker volumes
 db_data/
 
-
 # Test files
-sample_images
+sample_images
+bak

.vscode/settings.json

@@ -1,19 +1,23 @@
 {
-    "python.formatting.provider": "black",
     "editor.formatOnSave": true,
-    "python.linting.enabled": true,
-    "python.linting.flake8Enabled": true,
-    "[python]": {
-        "editor.formatOnSave": true,
-        "diffEditor.codeLens": true,
-    },
     "editor.codeActionsOnSave": {
         "source.organizeImports": "explicit",
         "source.sortImports": "explicit",
         "source.fixAll.markdownlint": "explicit",
         "source.fixAll": "explicit"
     },
+    "files.insertFinalNewline": true,
+    "files.eol": "\n",
     "files.trimTrailingWhitespace": true,
+    "isort.args": [
+        "--profile",
+        "black"
+    ],
+    "[python]": {
+        "editor.formatOnSave": true,
+        "diffEditor.codeLens": true,
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    },
     "cSpell.words": [
         "argmax",
         "astype",
@@ -27,5 +31,5 @@
         "sqlalchemy",
         "torchvision",
         "trapdata"
-    ],
+    ]
 }

pyproject.toml

@@ -30,7 +30,7 @@ torch = "^2.1.0"
 torchvision = "^0.16.0"
 timm = "^0.6.13"
 structlog = "^22.3.0"
-kivy = { extras = ["base"], version = "^2.1.0" }
+kivy = { extras = ["base"], version = "^2.3.0" }
 plyer = "^2.1.0"
 pyobjus = [
     { version = "^1.2.1", platform = "darwin" },