From 1aba443c3538eb6098bd6c4c4b0edc8fd7cf5446 Mon Sep 17 00:00:00 2001
From: Maxwell Lou <maxlou2005@gmail.com>
Date: Sat, 25 Jan 2025 18:15:31 -0500
Subject: [PATCH] integrate common changes for picamera library bugfix

---
 modules/common    | 2 +-
 pyproject.toml    | 4 ++--
 setup_project.ps1 | 5 ++---
 setup_project.sh  | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/common b/modules/common
index c7ab98a7..9acf88b4 160000
--- a/modules/common
+++ b/modules/common
@@ -1 +1 @@
-Subproject commit c7ab98a75be0f78c2c17084d30c7fce5708897ff
+Subproject commit 9acf88b42dfdb145e7eabb1b09a55df102ee00ad
diff --git a/pyproject.toml b/pyproject.toml
index e081f063..467fbf4f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -100,8 +100,8 @@ min-similarity-lines = 10
 
 [tool.pytest.ini_options]
 minversion = "6.0"
-# Submodules
-addopts = "--ignore=modules/common/"
+# Submodules and integration tests
+addopts = "--ignore=modules/common/ --ignore=tests/integration"
 
 [tool.black]
 line-length = 100
diff --git a/setup_project.ps1 b/setup_project.ps1
index 1ef6b0cf..734fa3be 100644
--- a/setup_project.ps1
+++ b/setup_project.ps1
@@ -8,13 +8,12 @@ if($?) {
     "Installing project dependencies..."
     pip install -r requirements.txt
     pip install -r requirements-pytorch.txt
-    
+
     ""
     "Installing submodules and their dependencies..."
     git submodule update --init --remote --recursive
     git submodule foreach --recursive "pip install -r requirements.txt"
-    
-    deactivate
+
     ""
     "Seutp complete!"
 } else {
diff --git a/setup_project.sh b/setup_project.sh
index 4e65fdd7..0af936eb 100644
--- a/setup_project.sh
+++ b/setup_project.sh
@@ -15,7 +15,6 @@ if [ $? -eq 0 ]; then
     git submodule update --init --remote --recursive
     git submodule foreach --recursive "pip install -r requirements.txt"
 
-    deactivate
     echo ""
     echo "Setup complete!"
 else