From a9a8ccdc831a80d3e5cdce613e1cb9bf9ccce86e Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Wed, 4 Jun 2025 11:40:57 +0200 Subject: [PATCH 01/13] Update install.sh update to qmake6 --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0e02751..3667f2e 100644 --- a/install.sh +++ b/install.sh @@ -113,7 +113,7 @@ tput cup 13 15 echo "[ 2/9] [##-------]" tput cup 15 5 echo "-> download GIT and other stuff.........." -apt-get -y install git cmake build-essential libusb-1.0 qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qt5-default libpulse-dev libx11-dev sox >> ${boswatch_install_path}/setup_log.txt 2>&1 +apt-get -y install git cmake build-essential libusb-1.0 qmake6 qt6-base-dev libpulse-dev libx11-dev sox >> ${boswatch_install_path}/setup_log.txt 2>&1 exitcodefunction $? download stuff tput cup 13 15 @@ -166,7 +166,7 @@ tput cup 15 5 echo "-> compile multimon-ng................." mkdir -p build cd build -qmake -qt=qt5 ../multimon-ng.pro >> ${boswatch_install_path}/setup_log.txt 2>&1 +qmake6 ../multimon-ng.pro >> ${boswatch_install_path}/setup_log.txt 2>&1 exitcodefunction $? qmake multimonNG make >> ${boswatch_install_path}/setup_log.txt 2>&1 From ffb1256e24a6c31a3756900796a19709256c9219 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Mon, 9 Jun 2025 12:54:38 +0200 Subject: [PATCH 02/13] Update run_pytest.yml --- .github/workflows/run_pytest.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index a047d48..0f26b5e 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -8,14 +8,14 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.7', '3.8', '3.9', '3.10'] - runs-on: ${{matrix.os}} + python-version: ['3.8', '3.9', '3.10'] + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} - uses: actions/setup-python@v3 + - name: Set up Python ${{ matrix.python-version }} at ${{ matrix.os }} + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -23,14 +23,14 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - mkdir log/ + mkdir -p log/ - name: Test with pytest run: | - pytest -c 'test/pytest.ini' + pytest -c test/pytest.ini - name: Save artifacts - uses: actions/upload-artifact@master + uses: actions/upload-artifact@v4 with: name: test.log - path: log/test.log + path: log/test.log \ No newline at end of file From 203feccbc688e6843b32e32b51c7bf87cc50c113 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Mon, 9 Jun 2025 18:18:03 +0200 Subject: [PATCH 03/13] Revert "Update run_pytest.yml" This reverts commit ffb1256e24a6c31a3756900796a19709256c9219. --- .github/workflows/run_pytest.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 0f26b5e..a047d48 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -8,14 +8,14 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.8', '3.9', '3.10'] - runs-on: ${{ matrix.os }} + python-version: ['3.7', '3.8', '3.9', '3.10'] + runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} at ${{ matrix.os }} - uses: actions/setup-python@v4 + - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} @@ -23,14 +23,14 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - mkdir -p log/ + mkdir log/ - name: Test with pytest run: | - pytest -c test/pytest.ini + pytest -c 'test/pytest.ini' - name: Save artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@master with: name: test.log - path: log/test.log \ No newline at end of file + path: log/test.log From 056de68ce28b3877c25da39f5ee145bb6c5e169b Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 07:31:43 +0200 Subject: [PATCH 04/13] Update run_pytest.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Entfernt **Python 3.7** aus der `matrix`, da sie nicht mehr von GitHub Actions bereitgestellt wird (End-of-Life). - Aktualisiert `actions/checkout` von `v1` auf `v3` (empfohlene aktuelle Version). - Verwendet `actions/upload-artifact@v3` anstelle von `@master` für stabileren Artifact-Upload. - Fügt `mkdir -p log/` hinzu, um sicherzustellen, dass das Log-Verzeichnis existiert. --- .github/workflows/run_pytest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index a047d48..1393799 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -8,11 +8,11 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} uses: actions/setup-python@v3 @@ -23,14 +23,14 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - mkdir log/ + mkdir -p log/ - name: Test with pytest run: | pytest -c 'test/pytest.ini' - name: Save artifacts - uses: actions/upload-artifact@master + uses: actions/upload-artifact@v3 with: name: test.log path: log/test.log From 2c21884a6114604ba3caeeb2620cebe89ebed990 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 07:45:11 +0200 Subject: [PATCH 05/13] Update run_pytest.yml + Pull-Request --- .github/workflows/run_pytest.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 1393799..be7414b 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -1,6 +1,9 @@ name: pytest -on: [push, pull_request] +on: + workflow_dispatch: # Hier manuelles Starten erlauben + push: + pull_request: jobs: build: From a877464c286ac78ff7ac2067c2c3f11aa4a4fd45 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 07:47:46 +0200 Subject: [PATCH 06/13] Update run_pytest.yml actions/upload-artifact@v3 to actions/upload-artifact@v4 From 9bcfcf6759aa48026d040329f45377844a12c088 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 07:50:03 +0200 Subject: [PATCH 07/13] Update run_pytest.yml actions/upload-artifact@v3 to actions/upload-artifact@v4 --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index be7414b..8cac602 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -33,7 +33,7 @@ jobs: pytest -c 'test/pytest.ini' - name: Save artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test.log path: log/test.log From d2225f899dc080321e3fcba667ea78aad5061a94 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 07:53:42 +0200 Subject: [PATCH 08/13] Update run_pytest.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Save artifacts name: test-${{ matrix.python-version }}.log Für jeden Test ein eigenes Logfile - aufgrund Fehler im Test --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 8cac602..05c35be 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -35,5 +35,5 @@ jobs: - name: Save artifacts uses: actions/upload-artifact@v4 with: - name: test.log + name: test-${{ matrix.python-version }}.log path: log/test.log From 0ba26181f38cfaf775b2d2c40965cadcc8e15276 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 08:03:47 +0200 Subject: [PATCH 09/13] Update requirements.txt Flake8 to 6.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0cca07d..8316ed1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ mkdocs # for develope only pytest pytest-cov -flake8==4.0.1 +flake8==6.1.0 pytest-flake8 pytest-flakes pytest-randomly From 889d00e66028319e8264e120807a2e6d8a8b91b1 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:47:28 +0200 Subject: [PATCH 10/13] Aktualisieren von run_pytest.yml v3.8 entfernt --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 05c35be..c29c4e9 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] runs-on: ${{matrix.os}} steps: From 3680f0a0d7a15dd164ed702888d2811b70b0c4b3 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:39:40 +0200 Subject: [PATCH 11/13] Aktualisieren von run_pytest.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v3.13 hinzugefügt --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index c29c4e9..73092a6 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{matrix.os}} steps: From 1a0f981c5ce14d05521520a32e689f12a3bdabe4 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Tue, 10 Jun 2025 13:18:35 +0200 Subject: [PATCH 12/13] Update run_pytest.yml Auskommentieren von workflow_dispatch --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 73092a6..1a32372 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -1,7 +1,7 @@ name: pytest on: - workflow_dispatch: # Hier manuelles Starten erlauben + #workflow_dispatch: # Hier manuelles Starten erlauben, automatisch nach jedem Commit push: pull_request: From 1f7ae72671292156d4b5f91fc1984c9109d1dc75 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Wed, 11 Jun 2025 09:38:50 +0200 Subject: [PATCH 13/13] Update run_pytest.yml workflow_dispatch entfernt --- .github/workflows/run_pytest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 1a32372..8eac1d9 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -1,7 +1,6 @@ name: pytest on: - #workflow_dispatch: # Hier manuelles Starten erlauben, automatisch nach jedem Commit push: pull_request: