From ac930a40f659d80ca29a57e95343ce5fabfda288 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Sun, 1 Jun 2025 15:49:05 -0400 Subject: [PATCH 1/2] make zip cross-os compatible --- content/FLASHDeconv/FLASHDeconvDownload.py | 2 +- content/FLASHTnT/FLASHTnTDownload.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/FLASHDeconv/FLASHDeconvDownload.py b/content/FLASHDeconv/FLASHDeconvDownload.py index fb11ec24..43b2f9aa 100644 --- a/content/FLASHDeconv/FLASHDeconvDownload.py +++ b/content/FLASHDeconv/FLASHDeconvDownload.py @@ -58,7 +58,7 @@ for filepath in file_manager.get_results( experiment, targets, partial=True ).values(): - f.write(filepath) + f.write(filepath, arcname=Path(filepath).name) zip_buffer.seek(0) file_manager.store_file( experiment, 'download_archive', zip_buffer, diff --git a/content/FLASHTnT/FLASHTnTDownload.py b/content/FLASHTnT/FLASHTnTDownload.py index 1a9f48be..d8df98ae 100644 --- a/content/FLASHTnT/FLASHTnTDownload.py +++ b/content/FLASHTnT/FLASHTnTDownload.py @@ -58,7 +58,7 @@ for filepath in file_manager.get_results( experiment, targets, partial=True ).values(): - f.write(filepath) + f.write(filepath, arcname=Path(filepath).name) zip_buffer.seek(0) file_manager.store_file( experiment, 'download_archive', zip_buffer, From 7a04ddc6f36b991af59358dd294c5920190d1614 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Sun, 1 Jun 2025 15:50:22 -0400 Subject: [PATCH 2/2] bump version --- .github/workflows/build-windows-executable-app.yaml | 2 +- settings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index cb38f8f2..feb31e08 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -14,7 +14,7 @@ env: OPENMS_VERSION: 3.2.0 PYTHON_VERSION: 3.11.0 # Name of the installer - APP_NAME: FLASHApp-0.8.3 + APP_NAME: FLASHApp-0.8.4 APP_UpgradeCode: "69ae44ad-d554-4e3c-8715-7c4daf60f8bb" jobs: diff --git a/settings.json b/settings.json index 9e44bda0..58bbb506 100644 --- a/settings.json +++ b/settings.json @@ -1,7 +1,7 @@ { "app-name": "FLASHApp", "github-user": "OpenMS", - "version": "0.8.3", + "version": "0.8.4", "repository-name": "FLASHApp", "analytics": { "google-analytics": {