Skip to content

revert changes to mac install script #1704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
David-Baddeley merged 1 commit into from
Sep 3, 2026
Merged

revert changes to mac install script #1704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions installers/install-python-microscopy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,26 @@ if ! command -v uv &>/dev/null; then
fi
fi

# --- Standalone Python installation via py-app-standalone ---
echo "==> Creating standalone Python installation..."
uv tool run py-app-standalone --python-version "$TARGET_PYTHON" --target "$DEST" --force "$PACKAGE_NAME"
# --- Managed Python ---
uv python install "$TARGET_PYTHON"

# --- Normalize cpython-* to a stable directory name ---
PYTHON_DIRS=( "$DEST"/cpython-* )
[[ -d "${PYTHON_DIRS[0]}" ]] || { echo "ERROR: standalone Python directory not found" >&2; exit 1; }
mv "${PYTHON_DIRS[0]}" "$DEST/python"
# Remove the bare-venv temp directory that py-app-standalone leaves behind.
rm -rf "$DEST/bare-venv"
# --- Virtual environment ---
uv venv --python "$TARGET_PYTHON" "$DEST/venv"

# --- Install PYME from pip ---
echo "==> Installing $PACKAGE_NAME..."
uv pip install --python "$DEST/venv/bin/python" "$PACKAGE_NAME"

# --- Top-level entry point symlinks ---
for ep in "${ENTRY_POINTS[@]}"; do
ln -sf "$DEST/python/bin/$ep" "$DEST/$ep"
ln -sf "$DEST/venv/bin/$ep" "$DEST/$ep"
done

# --- Shell helper (adds python/bin to PATH) ---
# --- Activated-shell helper ---
cat > "$DEST/pyme-shell" <<'SHELL_SCRIPT'
#!/usr/bin/env bash
PYME_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export PATH="$PYME_DIR/python/bin:$PATH"
source "$PYME_DIR/venv/bin/activate"
exec "${SHELL:-bash}"
SHELL_SCRIPT
chmod +x "$DEST/pyme-shell"
Expand Down
Loading