Skip to content

Commit 1cc153d

Browse files
authored
integrate common changes for picamera library bugfix (#246)
1 parent ac8ba42 commit 1cc153d

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ min-similarity-lines = 10
100100

101101
[tool.pytest.ini_options]
102102
minversion = "6.0"
103-
# Submodules
104-
addopts = "--ignore=modules/common/"
103+
# Submodules and integration tests
104+
addopts = "--ignore=modules/common/ --ignore=tests/integration"
105105

106106
[tool.black]
107107
line-length = 100

setup_project.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ if($?) {
88
"Installing project dependencies..."
99
pip install -r requirements.txt
1010
pip install -r requirements-pytorch.txt
11-
11+
1212
""
1313
"Installing submodules and their dependencies..."
1414
git submodule update --init --remote --recursive
1515
git submodule foreach --recursive "pip install -r requirements.txt"
16-
17-
deactivate
16+
1817
""
1918
"Seutp complete!"
2019
} else {

setup_project.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ if [ $? -eq 0 ]; then
1515
git submodule update --init --remote --recursive
1616
git submodule foreach --recursive "pip install -r requirements.txt"
1717

18-
deactivate
1918
echo ""
2019
echo "Setup complete!"
2120
else

0 commit comments

Comments
 (0)