Skip to content

Commit e7e0600

Browse files
committed
Pin more dependencies and update comments
1 parent 8b1484a commit e7e0600

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

.vscode/settings.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,17 @@
88
72
99
]
1010
},
11+
"trailing-spaces.includeEmptyLines": true,
12+
"trailing-spaces.trimOnSave": true,
13+
"trailing-spaces.syntaxIgnore": [
14+
"markdown"
15+
],
16+
"[markdown]": {
17+
"files.trimTrailingWhitespace": false,
18+
},
19+
"files.trimTrailingWhitespace": true,
1120
"files.insertFinalNewline": true,
1221
"files.trimFinalNewlines": true,
13-
"files.trimTrailingWhitespace": true,
1422
"editor.comments.insertSpace": true,
1523
"editor.insertSpaces": true,
1624
"editor.detectIndentation": false,
@@ -22,11 +30,6 @@
2230
"source.fixAll.convertImportFormat": true,
2331
"source.organizeImports": true,
2432
},
25-
"trailing-spaces.includeEmptyLines": true,
26-
"trailing-spaces.trimOnSave": true,
27-
"trailing-spaces.syntaxIgnore": [
28-
"markdown"
29-
],
3033
"emeraldwalk.runonsave": {
3134
"commands": [
3235
{

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Refer to the [build instructions](build%20instructions.md) if you'd like to buil
9292

9393
#### Capture Device
9494

95-
Select the Video Capture Device that you wanna use if selecting the `Video Capture Device` Capture Method. Will show `[occupied]` if a device is detected but can't be started.
95+
Select the Video Capture Device that you wanna use if selecting the `Video Capture Device` Capture Method. <!-- Will show `[occupied]` if a device is detected but can't be started. (currently disabled because poking at devices to turn turn them off freezes some like the GV-USB2)-->
9696

9797
#### Show Live Similarity
9898

scripts/lint.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ else {
4141

4242
Write-Host "`nRunning Bandit..."
4343
bandit src/ -f custom --silent --recursive
44-
# $exitCodes += $LastExitCode # Returns 1 on low
4544
if ($LastExitCode -gt 0) {
4645
Write-Host "`Bandit warning ($LastExitCode)" -ForegroundColor Yellow
4746
}
4847
else {
4948
Write-Host "`Bandit passed" -ForegroundColor Green
5049
}
5150

52-
5351
if ($exitCodes -gt 0) {
5452
Write-Host "`nLinting failed ($exitCodes)" -ForegroundColor Red
5553
}

scripts/requirements-dev.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
#
99
# Linters
1010
bandit
11-
flake8>=5,<6 # flake8-pyi deprecation warnings # flake8-quotes doesn't support v6 yet
11+
flake8>=6 # Validates configuration
1212
flake8-builtins
1313
flake8-bugbear
1414
flake8-class-attributes-order
15-
flake8-comprehensions>=3.8 # flake8 5 support
15+
flake8-comprehensions>=3.8 # flake8 v5 support
1616
flake8-datetimez
17-
flake8-pyi>=22.11.0 # flake8 6 support
18-
flake8-quotes
17+
flake8-pyi>=22.11.0 # flake8 v6 support
1918
flake8-simplify
2019
pep8-naming
21-
pylint>=2.14,<3.0.0 # New checks # 3.0 still in pre-release
20+
pylint>=2.14,<3.0.0 # New checks # 2.16 and 3.0 still in pre-release
2221
# Formatters
2322
add-trailing-comma>=2.3.0 # Added support for with statement
2423
autopep8>=2.0.0 # New checks

scripts/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
# Dependencies:
1313
certifi
1414
ImageHash>=4.3.1 # Contains type information + setup as package not module
15-
git+https://github.com/Avasam/keyboard.git@fix-563#egg=keyboard # Fix install on linux-ci https://github.com/boppreh/keyboard/pull/568
15+
git+https://github.com/boppreh/keyboard.git#egg=keyboard # Fix install on macos and linux-ci https://github.com/boppreh/keyboard/pull/568
1616
numpy>=1.23.2 # Python 3.11 wheels
1717
opencv-python-headless>=4.6 # Breaking changes importing cv2.cv2
1818
packaging
1919
Pillow>=9.2 # gnome-screeshot checks
2020
psutil
2121
PyAutoGUI
2222
--extra-index-url https://www.riverbankcomputing.com/pypi/simple/ --pre
23-
PyQt6>6.4.0 # Python 3.11 support
23+
PyQt6==6.4.1.dev2210280328 # Python 3.11 support # newer dev failed install
2424
requests
2525
toml
2626
#
2727
# Build and compile resources
28-
PyInstaller>=5.5 # Python 3.11 support
28+
pyinstaller>=5.5 # Python 3.11 support
2929
pyinstaller-hooks-contrib>=2022.9 # opencv-python 4.6 support. Changes for pywintypes and comtypes
3030
PySide6>=6.4.0.1 # Python 3.11 support
3131
#

0 commit comments

Comments
 (0)