From a0ebb3a9c6f1aee6905de2c668a15ad20fb56cad Mon Sep 17 00:00:00 2001 From: deej Date: Sun, 14 Sep 2025 17:54:31 -0400 Subject: [PATCH 01/14] Add comment that this script will also update FreeDATA --- tools/Linux/install-freedata-linux.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/Linux/install-freedata-linux.sh b/tools/Linux/install-freedata-linux.sh index 81673e55..5970948d 100755 --- a/tools/Linux/install-freedata-linux.sh +++ b/tools/Linux/install-freedata-linux.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Simple script to install FreeDATA in Linux -# Dj Merrill - N1JOV +# Simple script to install and also update FreeDATA in Linux +# To update FreeDATA, simply re-run the script in the same location # # Please note this script is not meant to cover all possible installations # but hopefully can be used as a guide if you are installing on other @@ -40,8 +40,13 @@ # FreeDATA config file is stored in $HOME/.config/FreeDATA/config.ini # See the run-freedata-linux.sh for more details # +# Dj Merrill - N1JOV +# # # Changelog: +# 2.7: 14 Sep 2025 (deej) +# Add comment that this script will also update FreeDATA +# # 2.6: 02 May 2025 (deej) # Allow any Hamlib released version as a second command line argument. # Note this requires specifying the FreeDATA branch as the From 07e4b8b212987832eb95178a00a829e87bf44785 Mon Sep 17 00:00:00 2001 From: deej Date: Tue, 16 Sep 2025 10:46:20 -0400 Subject: [PATCH 02/14] Add initial support for Debian 13 --- tools/Linux/install-freedata-linux.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/Linux/install-freedata-linux.sh b/tools/Linux/install-freedata-linux.sh index 5970948d..dc59381d 100755 --- a/tools/Linux/install-freedata-linux.sh +++ b/tools/Linux/install-freedata-linux.sh @@ -44,6 +44,9 @@ # # # Changelog: +# 2.8: 16 Sep 2025 +# Add initial support for Debian 13 +# # 2.7: 14 Sep 2025 (deej) # Add comment that this script will also update FreeDATA # @@ -155,7 +158,7 @@ echo "*************************************************************************" case $osname in "Debian GNU/Linux") case $osversion in - "11" | "12") + "11" | "12" | "13") sudo apt install --upgrade -y fonts-noto-color-emoji git build-essential cmake python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv wget python3-dev ;; From 7ed9dcf9c5720de40557c4f5700f771d325a6278 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Thu, 18 Sep 2025 13:00:51 +0200 Subject: [PATCH 03/14] update dependencies --- .github/workflows/build_appimage_bundle.yml | 6 +++--- .github/workflows/build_nsis_bundle.yml | 10 +++++----- .github/workflows/build_server.yml | 6 +++--- .github/workflows/gui_tests.yml | 1 + .github/workflows/pip_package.yml | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_appimage_bundle.yml b/.github/workflows/build_appimage_bundle.yml index f45cc535..0d10bdca 100644 --- a/.github/workflows/build_appimage_bundle.yml +++ b/.github/workflows/build_appimage_bundle.yml @@ -9,15 +9,15 @@ jobs: - name: Check out repository uses: actions/checkout@v5 - - name: Set up Python 3.11 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.13" - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v4 with: - node-version: 22 + node-version: 24 - name: Electron Builder working-directory: freedata_gui diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 1a696015..c80fe2e3 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -9,15 +9,15 @@ jobs: - name: Check out repository uses: actions/checkout@v5 - - name: Set up Python 3.11 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.13" - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v4 with: - node-version: 22 + node-version: 24 - name: Vue Builder working-directory: freedata_gui @@ -39,7 +39,7 @@ jobs: fileName: "hamlib-w64-*.zip" # latest: true extract: true - tag: '4.5.5' + tag: '4.6.5' out-file-path: "freedata_server/lib/hamlib" - name: Move Hamlib Files @@ -76,7 +76,7 @@ jobs: run: ls -R - name: Create installer - uses: joncloud/makensis-action@v4.1 + uses: joncloud/makensis-action@v5.0 with: script-file: "freedata-nsis-config.nsi" arguments: '/V3' diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index cff0edb5..ed90b30a 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -34,7 +34,7 @@ jobs: - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v4 with: - node-version: 22 + node-version: 24 - name: Vue Builder working-directory: freedata_gui @@ -42,10 +42,10 @@ jobs: npm i npm run build - - name: Set up Python 3.11 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.13" - name: Install Linux dependencies if: ${{startsWith(matrix.os, 'ubuntu')}} diff --git a/.github/workflows/gui_tests.yml b/.github/workflows/gui_tests.yml index 4adf540b..23ab0e7e 100644 --- a/.github/workflows/gui_tests.yml +++ b/.github/workflows/gui_tests.yml @@ -20,6 +20,7 @@ jobs: #- node-version: "18" # EOL - node-version: "20" - node-version: "22" + - node-version: "24" steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/pip_package.yml b/.github/workflows/pip_package.yml index 742c80cf..dbbe1931 100644 --- a/.github/workflows/pip_package.yml +++ b/.github/workflows/pip_package.yml @@ -15,7 +15,7 @@ jobs: - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v4 with: - node-version: 22 + node-version: 24 - name: Install Linux dependencies run: | From 73f596bd1142380ad58db972732e6a7cc2c36e26 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Thu, 18 Sep 2025 13:07:53 +0200 Subject: [PATCH 04/14] update dependencies --- freedata_gui/package.json | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/freedata_gui/package.json b/freedata_gui/package.json index 7c989ff5..90012036 100644 --- a/freedata_gui/package.json +++ b/freedata_gui/package.json @@ -26,36 +26,36 @@ "homepage": "https://freedata.app", "dependencies": { "@popperjs/core": "^2.11.8", - "bootstrap": "^5.3.7", - "bootstrap-icons": "^1.11.3", - "bootstrap-vue-next": "^0.30.0", - "chart.js": "^4.4.3", - "chartjs-plugin-annotation": "^3.0.1", - "core-js": "^3.8.3", + "bootstrap": "^5.3.8", + "bootstrap-icons": "^1.13.1", + "bootstrap-vue-next": "^0.40.4", + "chart.js": "^4.5.0", + "chartjs-plugin-annotation": "^3.1.0", + "core-js": "^3.45.1", "d3": "^7.9.0", - "dompurify": "^3.1.6", + "dompurify": "^3.2.7", "gettext-parser": "^8.0.0", - "gridstack": "^12.1.1", - "i18next": "^25.0.2", - "i18next-vue": "^5.2.0", + "gridstack": "^12.3.3", + "i18next": "^25.5.2", + "i18next-vue": "^5.3.0", "js-image-compressor": "^2.0.0", - "marked": "^16.0.0", - "pinia": "^3.0.1", + "marked": "^16.3.0", + "pinia": "^3.0.3", "qth-locator": "^2.1.0", "topojson-client": "^3.1.0", - "uuid": "^11.0.2", - "vue": "^3.2.13", - "vue-chartjs": "^5.3.1", - "vuemoji-picker": "^0.3.1" + "uuid": "^13.0.0", + "vue": "^3.5.21", + "vue-chartjs": "^5.3.2", + "vuemoji-picker": "^0.3.2" }, "devDependencies": { - "@babel/core": "^7.25.2", - "@babel/eslint-parser": "^7.25.1", - "@eslint/js": "^9.10.0", - "@vue/cli-service": "~5.0.8", - "eslint": "^9.0.0", - "eslint-plugin-vue": "^10.2.0", - "globals": "^16.0.0" + "@babel/core": "^7.28.4", + "@babel/eslint-parser": "^7.28.4", + "@eslint/js": "^9.35.0", + "@vue/cli-service": "~5.0.9", + "eslint": "^9.35.0", + "eslint-plugin-vue": "^10.4.0", + "globals": "^16.4.0" }, "browserslist": [ "> 1%", From 26e546d841dd606a3896eb7e44298fae42eaabbb Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 19 Sep 2025 09:07:46 +0200 Subject: [PATCH 05/14] fall backl to 3.12 because of sqalchemy build error --- .github/workflows/build_nsis_bundle.yml | 4 ++-- .github/workflows/build_server.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index c80fe2e3..99e9b80a 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -9,10 +9,10 @@ jobs: - name: Check out repository uses: actions/checkout@v5 - - name: Set up Python 3.13 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: "3.13" + python-version: "3.12" - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v4 diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index ed90b30a..30a6381c 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -12,7 +12,7 @@ jobs: include: - os: ubuntu-24.04 zip_name: freedata-server_ubuntu - generator: Unix Makefiles + #generator: Unix Makefiles modem_binary_name: freedata_server #- os: macos-latest @@ -22,7 +22,7 @@ jobs: - os: windows-latest zip_name: freedata-server_windows - generator: Visual Studio 16 2019 + #generator: Visual Studio 17 2022 modem_binary_name: freedata_server.exe steps: @@ -42,10 +42,10 @@ jobs: npm i npm run build - - name: Set up Python 3.13 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: "3.13" + python-version: "3.12" - name: Install Linux dependencies if: ${{startsWith(matrix.os, 'ubuntu')}} From 4d0fadcec6c871971143a6cd08dda93f31c36630 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 19 Sep 2025 09:09:34 +0200 Subject: [PATCH 06/14] test low memory option for nuitka --- .github/workflows/build_nsis_bundle.yml | 6 ++++-- .github/workflows/build_server.yml | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 99e9b80a..556b4294 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -9,10 +9,10 @@ jobs: - name: Check out repository uses: actions/checkout@v5 - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v4 @@ -69,6 +69,8 @@ jobs: --include-data-files=config.ini.example=config.ini ` --standalone server.py ` --output-filename=freedata-server + --low-memory + shell: pwsh diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 30a6381c..6a78da07 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -42,10 +42,10 @@ jobs: npm i npm run build - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" - name: Install Linux dependencies if: ${{startsWith(matrix.os, 'ubuntu')}} @@ -74,7 +74,7 @@ jobs: - name: Build binaries working-directory: freedata_server run: | - python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server + python3 -m nuitka --remove-output --low-memory --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server #- name: Download Portaudio binaries Linux macOS # if: ${{!startsWith(matrix.os, 'windows')}} From bc71a894edae5650f9570d7ecb5e9344f595d3bd Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 19 Sep 2025 12:28:38 +0200 Subject: [PATCH 07/14] test low memory option for nuitka --- .github/workflows/build_nsis_bundle.yml | 2 +- .github/workflows/build_server.yml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 556b4294..90446744 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -68,7 +68,7 @@ jobs: --include-data-files=lib/hamlib/bin/*.dll=lib/hamlib/bin/ ` --include-data-files=config.ini.example=config.ini ` --standalone server.py ` - --output-filename=freedata-server + --output-filename=freedata-server ` --low-memory shell: pwsh diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 6a78da07..02a925f3 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -74,7 +74,19 @@ jobs: - name: Build binaries working-directory: freedata_server run: | - python3 -m nuitka --remove-output --low-memory --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server + python3 -m nuitka ` + --remove-output ` + --assume-yes-for-downloads ` + --follow-imports ` + --include-data-dir=lib=lib ` + --include-data-dir=../freedata_gui/dist=gui ` + --include-data-files=lib/codec2/*=lib/codec2/ ` + --include-data-files=lib/hamlib/bin/*.exe=lib/hamlib/bin/ ` + --include-data-files=lib/hamlib/bin/*.dll=lib/hamlib/bin/ ` + --include-data-files=config.ini.example=config.ini ` + --standalone server.py ` + --output-filename=freedata-server ` + --low-memory #- name: Download Portaudio binaries Linux macOS # if: ${{!startsWith(matrix.os, 'windows')}} From 700be4c55ad2dcf36089eaa412669a60782a0c70 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 19 Sep 2025 12:29:50 +0200 Subject: [PATCH 08/14] test low memory option for nuitka --- .github/workflows/build_nsis_bundle.yml | 1 - .github/workflows/build_server.yml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 90446744..69d6b04f 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -70,7 +70,6 @@ jobs: --standalone server.py ` --output-filename=freedata-server ` --low-memory - shell: pwsh diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 02a925f3..4c03ffd1 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -87,6 +87,8 @@ jobs: --standalone server.py ` --output-filename=freedata-server ` --low-memory + shell: pwsh + #- name: Download Portaudio binaries Linux macOS # if: ${{!startsWith(matrix.os, 'windows')}} From db7e5a822fcd7167ed5b15819a6b8409ef3c34f9 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 19 Sep 2025 12:35:25 +0200 Subject: [PATCH 09/14] test low memory option for nuitka --- .github/workflows/build_server.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 4c03ffd1..8df52270 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -81,8 +81,6 @@ jobs: --include-data-dir=lib=lib ` --include-data-dir=../freedata_gui/dist=gui ` --include-data-files=lib/codec2/*=lib/codec2/ ` - --include-data-files=lib/hamlib/bin/*.exe=lib/hamlib/bin/ ` - --include-data-files=lib/hamlib/bin/*.dll=lib/hamlib/bin/ ` --include-data-files=config.ini.example=config.ini ` --standalone server.py ` --output-filename=freedata-server ` From ddee4e5337b544dabf27bc1fd2a71f6a4aeb73a9 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 19 Sep 2025 12:37:00 +0200 Subject: [PATCH 10/14] test low memory option for nuitka --- .github/workflows/build_server.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 8df52270..6a78da07 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -74,19 +74,7 @@ jobs: - name: Build binaries working-directory: freedata_server run: | - python3 -m nuitka ` - --remove-output ` - --assume-yes-for-downloads ` - --follow-imports ` - --include-data-dir=lib=lib ` - --include-data-dir=../freedata_gui/dist=gui ` - --include-data-files=lib/codec2/*=lib/codec2/ ` - --include-data-files=config.ini.example=config.ini ` - --standalone server.py ` - --output-filename=freedata-server ` - --low-memory - shell: pwsh - + python3 -m nuitka --remove-output --low-memory --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server #- name: Download Portaudio binaries Linux macOS # if: ${{!startsWith(matrix.os, 'windows')}} From 83cd3937d2ee925481311e4f9567f4fbf625a398 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sun, 21 Sep 2025 10:01:35 +0200 Subject: [PATCH 11/14] test with reduced sqalchemy packages --- .github/workflows/build_nsis_bundle.yml | 2 ++ .github/workflows/build_server.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 69d6b04f..33a5052a 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -67,6 +67,8 @@ jobs: --include-data-files=lib/hamlib/bin/*.exe=lib/hamlib/bin/ ` --include-data-files=lib/hamlib/bin/*.dll=lib/hamlib/bin/ ` --include-data-files=config.ini.example=config.ini ` + --nofollow-import-to=sqlalchemy.dialects ` + --include-package=sqlalchemy.dialects.sqlite ` --standalone server.py ` --output-filename=freedata-server ` --low-memory diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 6a78da07..aa929625 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -74,7 +74,7 @@ jobs: - name: Build binaries working-directory: freedata_server run: | - python3 -m nuitka --remove-output --low-memory --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server + python3 -m nuitka --remove-output --nofollow-import-to=sqlalchemy.dialects --include-package=sqlalchemy.dialects.sqlite --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server #- name: Download Portaudio binaries Linux macOS # if: ${{!startsWith(matrix.os, 'windows')}} From 5156e1e14a92029bac13e8f612917bca63008741 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sun, 21 Sep 2025 10:12:30 +0200 Subject: [PATCH 12/14] test with reduced sqalchemy packages --- .github/workflows/build_nsis_bundle.yml | 2 +- .github/workflows/build_server.yml | 2 +- freedata_server/message_p2p.py | 2 -- freedata_server/message_system_db_attachments.py | 1 - freedata_server/message_system_db_beacon.py | 6 +----- freedata_server/message_system_db_manager.py | 3 --- freedata_server/message_system_db_messages.py | 1 - freedata_server/message_system_db_model.py | 2 -- freedata_server/message_system_db_station.py | 3 --- 9 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 33a5052a..f7bc1a46 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -67,7 +67,7 @@ jobs: --include-data-files=lib/hamlib/bin/*.exe=lib/hamlib/bin/ ` --include-data-files=lib/hamlib/bin/*.dll=lib/hamlib/bin/ ` --include-data-files=config.ini.example=config.ini ` - --nofollow-import-to=sqlalchemy.dialects ` + --nofollow-import-to=sqlalchemy.dialects.mysql,sqlalchemy.dialects.mariadb,sqlalchemy.dialects.postgresql,sqlalchemy.dialects.oracle,sqlalchemy.dialects.mssql --include-package=sqlalchemy.dialects.sqlite ` --standalone server.py ` --output-filename=freedata-server ` diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index aa929625..8036fa0f 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -74,7 +74,7 @@ jobs: - name: Build binaries working-directory: freedata_server run: | - python3 -m nuitka --remove-output --nofollow-import-to=sqlalchemy.dialects --include-package=sqlalchemy.dialects.sqlite --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server + python3 -m nuitka --remove-output --nofollow-import-to=sqlalchemy.dialects.mysql,sqlalchemy.dialects.mariadb,sqlalchemy.dialects.postgresql,sqlalchemy.dialects.oracle,sqlalchemy.dialects.mssql --include-package=sqlalchemy.dialects.sqlite --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server #- name: Download Portaudio binaries Linux macOS # if: ${{!startsWith(matrix.os, 'windows')}} diff --git a/freedata_server/message_p2p.py b/freedata_server/message_p2p.py index a3d8dc5d..dc9de426 100644 --- a/freedata_server/message_p2p.py +++ b/freedata_server/message_p2p.py @@ -2,9 +2,7 @@ from datetime import datetime, timezone import api_validations import base64 import json -from message_system_db_manager import DatabaseManager from message_system_db_messages import DatabaseManagerMessages -#import command_message_send def message_received(ctx, data, statistics): diff --git a/freedata_server/message_system_db_attachments.py b/freedata_server/message_system_db_attachments.py index 4a8679aa..e4eb6071 100644 --- a/freedata_server/message_system_db_attachments.py +++ b/freedata_server/message_system_db_attachments.py @@ -2,7 +2,6 @@ from message_system_db_manager import DatabaseManager from message_system_db_model import MessageAttachment, Attachment, P2PMessage import json import hashlib -import os class DatabaseManagerAttachments(DatabaseManager): """Manages database operations for message attachments. diff --git a/freedata_server/message_system_db_beacon.py b/freedata_server/message_system_db_beacon.py index d7b4098f..59ae1abb 100644 --- a/freedata_server/message_system_db_beacon.py +++ b/freedata_server/message_system_db_beacon.py @@ -1,10 +1,6 @@ from message_system_db_manager import DatabaseManager -from sqlalchemy import create_engine -from sqlalchemy.orm import scoped_session, sessionmaker -from threading import local -from message_system_db_model import Base, Beacon, Station, Status, Attachment, P2PMessage +from message_system_db_model import Beacon, Station from datetime import timezone, timedelta, datetime -import os class DatabaseManagerBeacon(DatabaseManager): """Manages database operations for beacon signals. diff --git a/freedata_server/message_system_db_manager.py b/freedata_server/message_system_db_manager.py index ddd3f604..d6902114 100644 --- a/freedata_server/message_system_db_manager.py +++ b/freedata_server/message_system_db_manager.py @@ -1,6 +1,3 @@ -# database_manager.py -import sqlite3 - from sqlalchemy import create_engine, text, inspect from sqlalchemy.orm import scoped_session, sessionmaker from threading import local diff --git a/freedata_server/message_system_db_messages.py b/freedata_server/message_system_db_messages.py index cdadbf37..e0cefc43 100644 --- a/freedata_server/message_system_db_messages.py +++ b/freedata_server/message_system_db_messages.py @@ -5,7 +5,6 @@ from message_system_db_station import DatabaseManagerStations from sqlalchemy.exc import IntegrityError from datetime import datetime, timedelta import json -import os from exceptions import MessageStatusError class DatabaseManagerMessages(DatabaseManager): diff --git a/freedata_server/message_system_db_model.py b/freedata_server/message_system_db_model.py index 8c962f20..ea8d8437 100644 --- a/freedata_server/message_system_db_model.py +++ b/freedata_server/message_system_db_model.py @@ -1,5 +1,3 @@ -# models.py - from sqlalchemy import Index, Boolean, Column, String, Integer, JSON, ForeignKey, DateTime from sqlalchemy.orm import declarative_base, relationship diff --git a/freedata_server/message_system_db_station.py b/freedata_server/message_system_db_station.py index e13efbfa..24238a44 100644 --- a/freedata_server/message_system_db_station.py +++ b/freedata_server/message_system_db_station.py @@ -1,9 +1,6 @@ -from sqlalchemy.orm import Session from sqlalchemy.exc import SQLAlchemyError from message_system_db_model import Station from message_system_db_manager import DatabaseManager -import os - class DatabaseManagerStations(DatabaseManager): """Manages database operations for stations. From 86c2f67700e595ef19f9f34bc1cbcc56d8975731 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sun, 21 Sep 2025 10:17:09 +0200 Subject: [PATCH 13/14] test with reduced sqalchemy packages --- .github/workflows/build_nsis_bundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index f7bc1a46..16fee1d4 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -67,7 +67,7 @@ jobs: --include-data-files=lib/hamlib/bin/*.exe=lib/hamlib/bin/ ` --include-data-files=lib/hamlib/bin/*.dll=lib/hamlib/bin/ ` --include-data-files=config.ini.example=config.ini ` - --nofollow-import-to=sqlalchemy.dialects.mysql,sqlalchemy.dialects.mariadb,sqlalchemy.dialects.postgresql,sqlalchemy.dialects.oracle,sqlalchemy.dialects.mssql + --nofollow-import-to=sqlalchemy.dialects.mysql,sqlalchemy.dialects.mariadb,sqlalchemy.dialects.postgresql,sqlalchemy.dialects.oracle,sqlalchemy.dialects.mssql ` --include-package=sqlalchemy.dialects.sqlite ` --standalone server.py ` --output-filename=freedata-server ` From 804a1c60f08e4ea4330dbdfac4dac9da72435a66 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sun, 21 Sep 2025 11:53:25 +0200 Subject: [PATCH 14/14] install nsis via choco --- .github/workflows/build_nsis_bundle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 16fee1d4..ec3171c6 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -14,6 +14,9 @@ jobs: with: python-version: "3.13" + - name: Install NSIS via choco + run: choco install nsis + - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v4 with: