FreeDV
/
FreeDATA
mirror of https://github.com/DJ2LS/FreeDATA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dependabot/npm_and_yarn/freedata_gui/develop/i18next-vue-5.4.0

pull/1059/head
DJ2LS 2026-04-24 10:43:01 +02:00 committed by GitHub
parent 5d3f1f98b0 1b5a531f3d
commit 76751cb6fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_appimage_bundle.yml vendored
View File

@ -114,7 +114,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: 'FreeDATA-x86_64.AppImage'
path: FreeDATA-x86_64.AppImage

8
.github/workflows/build_docker_image.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v6
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
# Build a single-architecture image (using linux/amd64) so we can load it locally.
- name: Build Docker image for artifact
@ -25,7 +25,7 @@ jobs:
# Upload the image tarball as an artifact.
- name: Upload Docker image artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: freedata-image
path: freedata.tar
@ -46,7 +46,7 @@ jobs:
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
@ -56,7 +56,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push multi-arch Docker images
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: .
platforms: linux/amd64,linux/arm64

2
.github/workflows/build_nsis_bundle.yml vendored
View File

@ -92,7 +92,7 @@ jobs:
run: ls -R
- name: Upload artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: 'FreeDATA-Installer'
path: ./FreeDATA-Installer.exe

2
.github/workflows/build_server.yml vendored
View File

@ -117,7 +117,7 @@ jobs:
run: ls -R
- name: Upload artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: '${{ matrix.zip_name }}'
path: ./freedata_server/server.dist/${{ matrix.zip_name }}.zip

4
.github/workflows/ruff.yaml vendored
View File

@ -17,9 +17,9 @@ jobs:
ruff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.13"
- name: Install dependencies

24
freedata_gui/package-lock.json generated
View File

@ -13,7 +13,7 @@
"bootstrap": "^5.3.8",
"bootstrap-icons": "^1.13.1",
"bootstrap-vue-next": "^0.40.9",
"chart.js": "^4.5.0",
"chart.js": "^4.5.1",
"chartjs-plugin-annotation": "^3.1.0",
"core-js": "^3.46.0",
"d3": "^7.9.0",
@ -34,12 +34,12 @@
},
"devDependencies": {
"@babel/core": "^7.28.5",
"@babel/eslint-parser": "^7.28.5",
"@babel/eslint-parser": "^7.28.6",
"@eslint/js": "^9.35.0",
"@vue/cli-service": "~5.0.9",
"eslint": "^9.39.1",
"eslint-plugin-vue": "^10.4.0",
"globals": "^16.5.0"
"globals": "^17.3.0"
}
},
"node_modules/@achrinza/node-ipc": {
@ -114,9 +114,9 @@
}
},
"node_modules/@babel/eslint-parser": {
"version": "7.28.5",
"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.28.5.tgz",
"integrity": "sha512-fcdRcWahONYo+JRnJg1/AekOacGvKx12Gu0qXJXFi2WBqQA1i7+O5PaxRB7kxE/Op94dExnCiiar6T09pvdHpA==",
"version": "7.28.6",
"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.28.6.tgz",
"integrity": "sha512-QGmsKi2PBO/MHSQk+AAgA9R6OHQr+VqnniFE0eMWZcVcfBZoA2dKn2hUsl3Csg/Plt9opRUWdY7//VXsrIlEiA==",
"dev": true,
"license": "MIT",
"dependencies": {
@ -2504,9 +2504,9 @@
}
},
"node_modules/chart.js": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.0.tgz",
"integrity": "sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==",
"version": "4.5.1",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
"integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
"license": "MIT",
"dependencies": {
"@kurkle/color": "^0.3.0"
@ -5151,9 +5151,9 @@
"license": "BSD-2-Clause"
},
"node_modules/globals": {
"version": "16.5.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz",
"integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==",
"version": "17.3.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-17.3.0.tgz",
"integrity": "sha512-yMqGUQVVCkD4tqjOJf3TnrvaaHDMYp4VlUSObbkIiuCPe/ofdMBFIAcBbCSRFWOnos6qRiTVStDwqPLUclaxIw==",
"dev": true,
"license": "MIT",
"engines": {

6
freedata_gui/package.json
View File

@ -29,7 +29,7 @@
"bootstrap": "^5.3.8",
"bootstrap-icons": "^1.13.1",
"bootstrap-vue-next": "^0.40.9",
"chart.js": "^4.5.0",
"chart.js": "^4.5.1",
"chartjs-plugin-annotation": "^3.1.0",
"core-js": "^3.46.0",
"d3": "^7.9.0",
@ -50,12 +50,12 @@
},
"devDependencies": {
"@babel/core": "^7.28.5",
"@babel/eslint-parser": "^7.28.5",
"@babel/eslint-parser": "^7.28.6",
"@eslint/js": "^9.35.0",
"@vue/cli-service": "~5.0.9",
"eslint": "^9.39.1",
"eslint-plugin-vue": "^10.4.0",
"globals": "^16.5.0"
"globals": "^17.3.0"
},
"browserslist": [
"> 1%",

2
freedata_server/server.py
View File

@ -90,7 +90,7 @@ async def nocache(request: Request, call_next):
response.headers["Cache-Control"] = "no-store, no-cache, must-revalidate, private"
response.headers["Pragma"] = "no-cache"
# structlog stdlib logger akzeptiert %-Formatierung; alternativ key/value:
logger.info("[API] %s %s → %d", request.method, request.url.path, response.status_code)
logger.info("[API] %s %s -> %d", request.method, request.url.path, response.status_code)
return response

2
pyproject.toml
View File

@ -73,7 +73,7 @@ build = [
"wheel",
]
nuitka = [
"nuitka<=2.8.9",
"nuitka<=4.0.7",
]
[tool.setuptools.packages.find]

2
requirements.txt
View File

@ -26,4 +26,4 @@ pick
# Build
build
wheel
nuitka<=2.8.9
nuitka<=4.0.7