Cross platform packaging

.github/workflows/package_macos.yml

@@ -0,0 +1,153 @@
+name: macos-build
+
+on:
+  push:
+    branches: [ main ]
+    tags: [ "v*" ]
+  pull_request:
+  # Manual trigger so you can exercise the build (and optionally the
+  # release-upload step) from the Actions tab without cutting a tag.
+  workflow_dispatch:
+    inputs:
+      test_release_upload:
+        description: "Also push the .dmg(s) to a throwaway draft Release for end-to-end testing."
+        type: boolean
+        default: false
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-macos:
+    name: ${{ matrix.target_arch }} (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+
+    # `contents: write` is required for softprops/action-gh-release to
+    # create / update the GitHub Release. The release step itself is
+    # gated to tag pushes only, so PRs and main-branch pushes don't get
+    # write access.
+    permissions:
+      contents: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # macos-13 was deprecated by GitHub in Feb 2026. We now build on
+          # newer images and use MACOSX_DEPLOYMENT_TARGET to pin the
+          # backward-compatibility floor (the deployment target, not the
+          # build host, is what determines the minimum macOS the binary
+          # will run on).
+          - os: macos-15-intel
+            target_arch: x86_64
+            macos_min_version: "10.13.0"
+            macosx_deployment_target: "10.13"
+          - os: macos-14
+            target_arch: arm64
+            macos_min_version: "11.0.0"
+            macosx_deployment_target: "11.0"
+
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    env:
+      TARGET_ARCH: ${{ matrix.target_arch }}
+      MACOS_MIN_VERSION: ${{ matrix.macos_min_version }}
+      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          # Need full history for setuptools_scm to derive the version.
+          fetch-depth: 0
+
+      - name: Set up Conda
+        uses: conda-incubator/setup-miniconda@v4
+        with:
+          python-version: "3.12"
+          auto-update-conda: true
+          channels: conda-forge
+          activate-environment: "datashuttle-package"
+
+      - name: Install pip
+        run: conda install pip
+
+      - name: Install rclone
+        run: conda install -c conda-forge rclone
+
+      - name: Install create-dmg
+        run: brew install create-dmg
+
+      # Import the Developer ID Application certificate into a temporary
+      # keychain. The keychain is torn down automatically at job end so
+      # the cert never persists on the runner. Only runs on tag pushes and
+      # opt-in manual dispatches — PRs and main-branch pushes don't get
+      # access to the secrets.
+      - name: Import code-signing certificate
+        if: >-
+          startsWith(github.ref, 'refs/tags/v') ||
+          (github.event_name == 'workflow_dispatch' &&
+           inputs.test_release_upload)
+        uses: apple-actions/import-codesign-certs@v3
+        with:
+          p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
+          p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }}
+
+      - name: Install datashuttle and packaging deps
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install .[dev]
+          python -m pip install pyinstaller requests
+
+      - name: Run macOS packaging script
+        env:
+          # The signing / notarisation env vars are read by
+          # package/macos/sign_macos.py. They are only present on tag pushes and
+          # opt-in manual dispatches; on PRs they are empty strings and
+          # sign_macos becomes a no-op.
+          MACOS_SIGNING_IDENTITY: ${{ secrets.MACOS_SIGNING_IDENTITY }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+        run: python package/macos/package_macos.py
+
+      - name: Verify .app bundle is valid for this arch
+        run: |
+          BIN="package/macos/dist/Datashuttle.app/Contents/Resources/datashuttle"
+          test -x "$BIN"
+          file "$BIN"
+          # Ensure the architecture matches what we asked PyInstaller to build.
+          lipo -archs "$BIN" | grep -q "${TARGET_ARCH}"
+          # Print the Info.plist min OS version so it's visible in the log.
+          /usr/libexec/PlistBuddy -c "Print :LSMinimumSystemVersion" \
+            package/macos/dist/Datashuttle.app/Contents/Info.plist
+
+      - name: Upload installer artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-installer-${{ matrix.target_arch }}
+          path: package/macos/Output/datashuttle-*-${{ matrix.target_arch }}.dmg
+
+      # Attach the .dmg to a GitHub Release in two cases:
+      #  * Real tag push (v*) -> draft release named after the tag.
+      #  * Manual run with `test_release_upload=true` -> draft release
+      #    named `test-build-<run_id>`, safe to delete afterwards.
+      # `softprops/action-gh-release` creates the release as a draft if
+      # it doesn't already exist, and appends assets if it does — so the
+      # arm64 and x86_64 matrix jobs both attach to the same release.
+      - name: Attach .dmg to GitHub Release
+        if: >-
+          startsWith(github.ref, 'refs/tags/v') ||
+          (github.event_name == 'workflow_dispatch' &&
+           inputs.test_release_upload)
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          prerelease: ${{ github.event_name == 'workflow_dispatch' }}
+          tag_name: ${{ github.event_name == 'workflow_dispatch' && format('test-build-{0}', github.run_id) || github.ref_name }}
+          name: ${{ github.event_name == 'workflow_dispatch' && format('Test build {0}', github.run_id) || github.ref_name }}
+          target_commitish: ${{ github.sha }}
+          files: package/macos/Output/datashuttle-*-${{ matrix.target_arch }}.dmg
+          fail_on_unmatched_files: true

.github/workflows/package_windows.yml

@@ -0,0 +1,93 @@
+name: windows-build
+
+on:
+  push:
+    branches: [ main ]
+    tags: [ "v*" ]
+  pull_request:
+  # Manual trigger so you can exercise the build (and optionally the
+  # release-upload step) from the Actions tab without cutting a tag.
+  workflow_dispatch:
+    inputs:
+      test_release_upload:
+        description: "Also push the .exe to a throwaway draft Release for end-to-end testing."
+        type: boolean
+        default: false
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+
+    # `contents: write` is required for softprops/action-gh-release to
+    # create / update the GitHub Release. The release step itself is
+    # gated to tag pushes only.
+    permissions:
+      contents: write
+
+    defaults:
+      run:
+        shell: powershell
+
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up Conda
+        uses: conda-incubator/setup-miniconda@v4
+        with:
+          python-version: "3.12"
+          auto-update-conda: true
+          channels: conda-forge
+          activate-environment: "datashuttle-test"
+
+      - name: Install pip
+        run: conda install pip
+
+      - name: Install rclone
+        run: conda install -c conda-forge rclone
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install .[dev]
+          python -m pip install pyinstaller requests
+
+      # Install Inno Setup silently
+      - name: Install Inno Setup
+        run: |
+          choco install innosetup --yes
+
+      - name: Verify Inno Setup installation
+        run: |
+          Get-Command "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
+
+      - name: Run Windows packaging script
+        run: |
+          python package/windows/package_windows.py
+
+      - name: Upload installer artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-installer
+          path: package\windows\Output\datashuttle_*.exe
+
+      # Attach the .exe to a GitHub Release in two cases:
+      #  * Real tag push (v*) -> draft release named after the tag.
+      #  * Manual run with `test_release_upload=true` -> draft release
+      #    named `test-build-<run_id>`, safe to delete afterwards.
+      - name: Attach .exe to GitHub Release
+        if: >-
+          startsWith(github.ref, 'refs/tags/v') ||
+          (github.event_name == 'workflow_dispatch' &&
+           inputs.test_release_upload)
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          prerelease: ${{ github.event_name == 'workflow_dispatch' }}
+          tag_name: ${{ github.event_name == 'workflow_dispatch' && format('test-build-{0}', github.run_id) || github.ref_name }}
+          name: ${{ github.event_name == 'workflow_dispatch' && format('Test build {0}', github.run_id) || github.ref_name }}
+          target_commitish: ${{ github.sha }}
+          files: package/windows/Output/datashuttle_*.exe
+          fail_on_unmatched_files: true

.gitignore

@@ -1,6 +1,15 @@
 # python-dotenv environment file for test account credentials.
 .env
 
+# Packaging
+package/_vendored
+package/windows/build
+package/windows/dist
+package/windows/Output
+package/windows/inno_compile_script.iss
+package/macos/build
+package/macos/dist
+package/macos/Output
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -35,7 +44,6 @@ MANIFEST
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
-*.spec
 
 # Installer logs
 pip-log.txt

datashuttle/tui/app.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import sys
 from typing import TYPE_CHECKING, Dict
 
 if TYPE_CHECKING:
@@ -29,6 +30,24 @@
 from datashuttle.tui.tooltips import get_tooltip
 
 
+def _resolve_css_path() -> list[Path]:
+    """Resolve the directory containing the TUI ``.tcss`` files.
+
+    When running from source, the stylesheets live next to this module.
+    When running as a PyInstaller-frozen executable, the ``.tcss`` files
+    are bundled under ``_MEIPASS/datashuttle/tui/css/`` via the spec's
+    ``datas`` entry; the synthetic ``__file__`` for this module cannot
+    be relied on for that lookup (especially on macOS), so prefer
+    ``sys._MEIPASS`` when frozen.
+    """
+    if getattr(sys, "frozen", False):
+        base = Path(getattr(sys, "_MEIPASS", Path(sys.executable).parent))
+        css_dir = base / "datashuttle" / "tui" / "css"
+    else:
+        css_dir = Path(__file__).parent / "css"
+    return sorted(css_dir.glob("*.tcss"))
+
+
 class TuiApp(App, inherit_bindings=False):  # type: ignore
     """The main app page for the DataShuttle TUI.
 
@@ -38,7 +57,7 @@ class TuiApp(App, inherit_bindings=False):  # type: ignore
     """
 
     tui_path = Path(__file__).parent
-    CSS_PATH = list(Path(tui_path / "css").glob("*.tcss"))
+    CSS_PATH = _resolve_css_path()
     ENABLE_COMMAND_PALETTE = False
 
     BINDINGS = [

datashuttle/tui/css/tui_menu.tcss

@@ -4,6 +4,7 @@
 #mainwindow_contents_container {
     align: center top;
     padding: 1 0 0 0;
+    overflow: hidden auto;
 }
 #mainwindow_contents_container > Button {
     width: 50%;

datashuttle/tui_launcher.py

@@ -42,4 +42,7 @@
 
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except:
+        input("hello")