Merge pull request #489 from AndreWohnsland/dev

Add sumup payment

Author: AndreWohnsland

.git-blame-ignore-revs

@@ -1,4 +1,6 @@
 # apply alphabetic, explicit import sorting (new hash)
 9b553ce9f06f5fcd9584df7d17248bd9351a1b9b
 # biome linting switch (from eslint)
-3a19c942d54c6263c936aea87d0b38ec119925bb
+3a19c942d54c6263c936aea87d0b38ec119925bb
+# ty linting changes
+7fe31489c1c07250de4e4efa5b7e3daafae48136

.github/workflows/code-check.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.13"]
+        python-version: ["3.13"]
     steps:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@v6
@@ -24,26 +24,26 @@ jobs:
       - name: 🔍 Lint with ruff
         run: uv run ruff check src
 
-  mypy:
+  ty:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.13"]
+        python-version: ["3.13"]
     steps:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@v6
       - name: Install the latest version of uv using Python ${{ matrix.python-version }}
         uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
-      - name: 🔍 Lint with MyPy
-        run: uv run --extra v1 mypy src
+      - name: 🔍 Type Checking with ty
+        run: uv run --extra v1 ty check src
 
   pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.13"]
+        python-version: ["3.13"]
     steps:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@v6

.pre-commit-config.yaml

@@ -6,20 +6,20 @@ default_install_hook_types:
 exclude: ^(.*(\.?venv.*)/)
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.10
+    rev: v0.15.0
     hooks:
       - id: ruff-format
         name: ☕️ Use Ruff to format code
       - id: ruff-check
         name: ☕️ Use Ruff to lint code
         args: [--fix]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-json
         name: ☕️ Check for JSON syntax errors
   - repo: https://github.com/koalaman/shellcheck-precommit
-    rev: v0.10.0
+    rev: v0.11.0
     hooks:
       - id: shellcheck
         name: ☕️ Ensure Shell Scripts are good with ShellCheck

.sonarcloud.properties

@@ -1,2 +1,5 @@
 sonar.python.version=3.11
 sonar.cpd.exclusions=**/*.stories.ts
+sonar.issue.ignore.multicriteria=e1
+sonar.issue.ignore.multicriteria.e1.ruleKey=python:S8415
+sonar.issue.ignore.multicriteria.e1.resourceKey=**/*.py

.vscode/settings.json

@@ -26,6 +26,7 @@
       "source.organizeImports": "explicit"
     }
   },
+  "ruff.configuration": "pyproject.toml",
   "[typescript]": {
     "editor.defaultFormatter": "biomejs.biome",
     "editor.codeActionsOnSave": {

CONTRIBUTING.md

@@ -22,7 +22,7 @@ Pull requests are the best way to propose changes to the codebase:
 4. Ensure the test suite passes.
 5. Run & Check UI changes to make sure everything works and looks good.
 6. Use pyqt ui files where possible (see [dev notes](./docs/.devnotes.md#qt-template-files))
-7. Make sure your code lints (mypy & ruff).
+7. Make sure your code lints (ty & ruff).
 8. Issue that pull request!
 
 ## You can use AI tools BUT

docs/.devnotes.md

@@ -122,7 +122,8 @@ echo "Waiting for WiFi"
 sleep 10
 export QT_SCALE_FACTOR=1
 cd ~/CocktailBerry/
-sudo python runme.py
+uv sync --inexact --extra v1
+sudo -E .venv/bin/python runme.py
 # cocktail.desktop at "/etc/xdg/autostart/"
 [Desktop Entry]
 Type=Application
@@ -256,7 +257,7 @@ Example for powershell:
 
 ```powershell
 $Env:QT_SCALE_FACTOR = "2"
-python runme.py
+uv run runme.py
 ```
 
 # Outdated Section

docs/addons.md

@@ -80,16 +80,16 @@ Here you will find the ressources to get started.
 ### Set Up
 
 First, you should clone the latest version of CocktailBerry in your development environment.
-Install all needed dependencies, either over pip or with poetry (recommended).
+Install all needed dependencies with `uv sync` (add `--extra v1` for the Qt version).
 Usually **one** Python file is used per addon, placed in the `addons` folder in the CocktailBerry project.
 Files within this folder will not be tracked by git.
 
 !!! tip "Use the CLI"
     It's super easy to create a skeleton addon file with the [CLI command](commands.md#creating-addon-base-file)!
     Just run:
-    
+
     ```bash
-    python runme.py create-addon "Your Addon Name"
+    uv run runme.py create-addon "Your Addon Name"
     ```
 
     This will create a file with the needed structure in the addons folder.

docs/commands.md

@@ -251,3 +251,7 @@ uv run runme.py remove-ap [OPTIONS]
 #   --ssid      SSID Name of the AP [default: CocktailBerry]
 #   --help      Show help
 ```
+
+## Virtual Keyboard Commands
+
+For managing the virtual keyboard on the Raspberry Pi when using the web interface (v2), see the [web documentation](web.md#enable-the-virtual-keyboard) for the `add-virtual-keyboard` and `remove-virtual-keyboard` commands.

docs/faq.md

@@ -55,15 +55,14 @@ In case of any issues related to the GUI (like window positioning, overlap), ple
 ### Which Raspberry Pi OS to Use
 
 Please use the latest Raspberry Pi Desktop OS, currently this is Raspberry Pi OS with desktop in 64 bit, also known as Debian 13 or Trixie.
-These OS run Python 3.11/3.13, which is the current mandatory Version of Python to run CocktailBerry.
+CocktailBerry requires **Python 3.13 or newer** (Trixie ships with Python 3.13).
 Older OS may work, but are not supported.
 
 ### Will Older Python Version Work
 
-Not with the current Version of CocktailBerry.
-Best is to use the specified Python version (or newer).
-Older version may work, but are not supported.
-Generally, it is always recommended to use a fresh setup raspberry for the best experience.
+CocktailBerry requires **Python 3.13 or newer**.
+Older versions are not supported.
+Generally, it is always recommended to use a fresh Raspberry Pi OS setup for the best experience.
 
 ### How to get Updates