pumaguard 21.post27__tar.gz → 21.post83__tar.gz

{pumaguard-21.post27 → pumaguard-21.post83}/.github/workflows/build-webpage.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - uses: ./.github/actions/setup-python

{pumaguard-21.post27 → pumaguard-21.post83}/.github/workflows/codeql.yaml

@@ -32,7 +32,7 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v4

{pumaguard-21.post27 → pumaguard-21.post83}/.github/workflows/test-and-package.yaml

@@ -102,9 +102,6 @@ jobs:
           pushd training-data
           git archive --output ../training-data.tar.gz HEAD verification Stables testlion_100525
           popd
-          pushd pumaguard-ui
-          git archive --output ../pumaguard-ui.tar.gz HEAD
-          popd
       - uses: actions/upload-artifact@v4
         with:
           name: submodule-models
@@ -113,10 +110,6 @@ jobs:
         with:
           name: submodule-data
           path: training-data.tar.gz
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ui-data
-          path: pumaguard-ui.tar.gz
 
   test-python:
     runs-on: ubuntu-latest
@@ -157,23 +150,37 @@ jobs:
   test-ui:
     runs-on: ubuntu-latest
     needs:
-      - compress-submodules
+      - lint-ui
 
     steps:
       - uses: actions/checkout@v6
       - uses: ./.github/actions/clean-runner
-      - uses: actions/download-artifact@v4
-        with:
-          name: ui-data
-      - name: Unpack ui source
-        run: |
-          set -e -u -x
-          tar -C pumaguard-ui -xf pumaguard-ui.tar.gz
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
+        with:
+          channel: stable
       - name: Test UI
         run: make test-ui
 
+  lint-ui:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/clean-runner
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter doctor
+      - run: |
+            ls -lh pumaguard-ui
+            ls -lh pumaguard-ui/test
+            ls -lh pumaguard-ui/test/models
+            cat pumaguard-ui/test/models/status_test.dart
+      - name: Lint UI
+        run: make lint-ui
+
   test-server:
     runs-on: ubuntu-latest
     needs:
@@ -235,13 +242,6 @@ jobs:
         run: |
           set -e -u -x
           tar -C pumaguard-models -xf pumaguard-models.tar.gz
-      - uses: actions/download-artifact@v4
-        with:
-          name: ui-data
-      - name: Unpack ui source
-        run: |
-          set -e -u -x
-          tar -C pumaguard-ui -xf pumaguard-ui.tar.gz
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: ./.github/actions/setup-python
         with:

{pumaguard-21.post27 → pumaguard-21.post83}/.gitmodules

@@ -4,6 +4,3 @@
 [submodule "training-data"]
 	path = training-data
 	url = https://github.com/PEEC-Nature-Youth-Group/training-data.git
-[submodule "pumaguard-ui"]
-	path = pumaguard-ui
-	url = git@github.com:PEEC-Nature-Youth-Group/pumaguard-ui.git

{pumaguard-21.post27 → pumaguard-21.post83}/Makefile

@@ -46,12 +46,17 @@ install-dev: .venv
 test: install-dev
 	uv run --native-tls --frozen pytest --verbose --cov=pumaguard --cov-report=term-missing
 
-.PHONY: test-ui
-test-ui:
+.PHONY: lint-ui
+lint-ui:
 	make -C pumaguard-ui version
 	cd pumaguard-ui; flutter pub get
 	cd pumaguard-ui; dart format --set-exit-if-changed lib test
 	cd pumaguard-ui; flutter analyze
+
+.PHONY: test-ui
+test-ui:
+	make -C pumaguard-ui version
+	cd pumaguard-ui; flutter pub get
 	cd pumaguard-ui; flutter test
 
 .PHONY: build
@@ -154,8 +159,8 @@ release:
 	  git tag -a -m "Release v$${NEW_RELEASE}" v$${NEW_RELEASE}
 
 .PHONY: configure-device
-configure-device: install-dev
-	ANSIBLE_STDOUT_CALLBACK=yaml uv run ansible-playbook --inventory $(DEVICE), --user $(DEVICE_USER) --diff --ask-become-pass --ask-vault-pass --skip-tags $(ANSIBLE_SKIP_TAGS) scripts/configure-device.yaml
+configure-device: install-dev build
+	ANSIBLE_STDOUT_CALLBACK=yaml uv run ansible-playbook --inventory $(DEVICE), --user $(DEVICE_USER) --diff --ask-become-pass --ask-vault-pass --extra-vars "pumaguard_install_method=local" --skip-tags $(ANSIBLE_SKIP_TAGS) scripts/configure-device.yaml
 
 .PHONY: configure-laptop
 configure-laptop: install-dev

{pumaguard-21.post27 → pumaguard-21.post83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pumaguard
-Version: 21.post27
+Version: 21.post83
 Author-email: Nicolas Bock <nicolasbock@gmail.com>
 Project-URL: Homepage, http://pumaguard.rtfd.io/
 Project-URL: Repository, https://github.com/PEEC-Nature-Youth-Group/pumaguard

{pumaguard-21.post27 → pumaguard-21.post83}/pumaguard/presets.py

@@ -148,6 +148,7 @@ class Preset:
         self.volume = 80  # Volume level 0-100 for ALSA playback
         self.print_download_progress = True
         self.cameras: list[dict[str, str]] = []  # List of detected cameras
+        self.plugs: list[dict[str, str]] = []  # List of detected plugs
         self.no_lion_directories: list[str] = []
         self.validation_no_lion_directories: list[str] = []
         self.with_augmentation = False

pumaguard-21.post83/pumaguard/pumaguard-ui/.last_build_id

@@ -0,0 +1 @@
+53820be1a72b05da5cf172a982a8e2e7