Skip to content

Fix library path in macos #7

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

Closed
yasuo-ozu wants to merge 2 commits into from
Closed

Fix library path in macos #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6951dfc
fix mac
yasuo-ozu Apr 9, 2026
39122ed
fix for win
yasuo-ozu Apr 9, 2026
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
73 changes: 73 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
types: [published]

jobs:

build-qret:
runs-on: ${{ matrix.os }}
strategy:
Expand Down Expand Up @@ -107,6 +108,7 @@ jobs:

- name: Install libyaml-cpp (Linux)
if: runner.os == 'Linux'
shell: bash
run: |
sudo apt-get update
sudo apt-get install -y build-essential gcc g++ libyaml-cpp0.8 libyaml-cpp-dev
Expand Down Expand Up @@ -148,9 +150,11 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake"

- name: Build qret
shell: bash
run: cmake --build build --config Release --target qret

- name: Install to stage
shell: bash
run: cmake --install build --config Release --prefix stage

- name: Package artifact
Expand Down Expand Up @@ -196,6 +200,75 @@ jobs:
name: qret-${{ matrix.asset_suffix }}
path: dist/qret-${{ matrix.asset_suffix }}.${{ matrix.archive_ext }}

build-wheel:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- macos-latest
- macos-15-intel
- ubuntu-latest
- windows-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.11"

- name: Build wheel
shell: bash
run: |
python -m pip install --upgrade pip
python -m pip install build
python -m build --wheel

- name: Upload wheel artifact
uses: actions/upload-artifact@v4
with:
name: qret-cli-bundle-wheel-${{ matrix.os }}
path: dist/*.whl

test-qret:
runs-on: ${{ matrix.os }}
needs: [build-wheel]
strategy:
fail-fast: false
matrix:
os:
- macos-latest
- macos-15-intel
- ubuntu-latest
- windows-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.11"

- name: Download wheel artifact
uses: actions/download-artifact@v4
with:
name: qret-cli-bundle-wheel-${{ matrix.os }}
path: dist

- name: Install test deps and wheel artifact
shell: bash
run: |
python -m pip install --upgrade pip
python -m pip install pytest
python -m pip install dist/*.whl

- name: Run pytest
shell: bash
run: pytest -q tests/test_qret_cli_bundle.py

release:
if: github.event_name == 'release'
needs: [build-qret]
Expand Down
58 changes: 29 additions & 29 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,36 @@ jobs:
python -m pip install --upgrade pip
python -m pip install -e ".[test]"

- name: Prepare qret stub for test (Unix)
if: runner.os != 'Windows'
run: |
mkdir -p .ci-bin
cat > .ci-bin/qret <<'EOF'
#!/usr/bin/env sh
echo "qret 0.0.0-ci"
EOF
cat > .ci-bin/gridsynth <<'EOF'
#!/usr/bin/env sh
echo "gridsynth 0.0.0-ci"
EOF
chmod +x .ci-bin/qret
chmod +x .ci-bin/gridsynth
echo "$GITHUB_WORKSPACE/.ci-bin" >> "$GITHUB_PATH"
# - name: Prepare qret stub for test (Unix)
# if: runner.os != 'Windows'
# run: |
# mkdir -p .ci-bin
# cat > .ci-bin/qret <<'EOF'
# #!/usr/bin/env sh
# echo "qret 0.0.0-ci"
# EOF
# cat > .ci-bin/gridsynth <<'EOF'
# #!/usr/bin/env sh
# echo "gridsynth 0.0.0-ci"
# EOF
# chmod +x .ci-bin/qret
# chmod +x .ci-bin/gridsynth
# echo "$GITHUB_WORKSPACE/.ci-bin" >> "$GITHUB_PATH"

- name: Prepare qret stub for test (Windows)
if: runner.os == 'Windows'
shell: pwsh
run: |
New-Item -ItemType Directory -Force -Path .ci-bin | Out-Null
@'
@echo off
echo qret 0.0.0-ci
'@ | Set-Content -Path .ci-bin/qret.cmd
@'
@echo off
echo gridsynth 0.0.0-ci
'@ | Set-Content -Path .ci-bin/gridsynth.cmd
"$env:GITHUB_WORKSPACE/.ci-bin" | Out-File -FilePath $env:GITHUB_PATH -Append
# - name: Prepare qret stub for test (Windows)
# if: runner.os == 'Windows'
# shell: pwsh
# run: |
# New-Item -ItemType Directory -Force -Path .ci-bin | Out-Null
# @'
# @echo off
# echo qret 0.0.0-ci
# '@ | Set-Content -Path .ci-bin/qret.cmd
# @'
# @echo off
# echo gridsynth 0.0.0-ci
# '@ | Set-Content -Path .ci-bin/gridsynth.cmd
# "$env:GITHUB_WORKSPACE/.ci-bin" | Out-File -FilePath $env:GITHUB_PATH -Append

- name: Run pytest
run: pytest -q tests/test_qret_cli_bundle.py
23 changes: 20 additions & 3 deletions qret_cli_bundle/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,17 @@ def _append_env_path(var_name: str, entry: str) -> None:
os.environ[var_name] = current + os.pathsep + entry if current else entry


def _resolve_bundled_executable(bin_dir: Path, name: str) -> Path | None:
if platform.system() == "Windows":
for ext in ("", ".exe", ".cmd", ".bat"):
candidate = bin_dir / f"{name}{ext}"
if candidate.exists():
return candidate
return None
candidate = bin_dir / name
return candidate if candidate.exists() else None


def ensure_qret_on_path() -> None:

install_root = Path(__file__).parent / "bundle"
Expand All @@ -98,8 +109,13 @@ def ensure_qret_on_path() -> None:
_append_env_path("PATH", str(bin_dir))
if platform.system() == "Linux":
_append_env_path("LD_LIBRARY_PATH", str(lib_dir))
elif platform.system() == "Darwin":
_append_env_path("DYLD_LIBRARY_PATH", str(lib_dir))

@Kazutaka333 Kazutaka333 Apr 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've read manually manipulating DYLD_LIBRARY_PATH is not ideal and using DYLD_FALLBACK_LIBRARY_PATH seem to be encouraged.

Suggested change
_append_env_path("DYLD_LIBRARY_PATH", str(lib_dir))
_append_env_path("DYLD_FALLBACK_LIBRARY_PATH", str(lib_dir))

https://stackoverflow.com/a/3172515


if not (bin_dir / "qret").exists() or not (bin_dir / "gridsynth").exists():
qret_bin = _resolve_bundled_executable(bin_dir, "qret")
gridsynth_bin = _resolve_bundled_executable(bin_dir, "gridsynth")

if qret_bin is None or gridsynth_bin is None:
asset_name = _platform_asset_name()
release = _release_json()
assets = {asset["name"]: asset["browser_download_url"] for asset in release.get("assets", [])}
Expand All @@ -118,8 +134,9 @@ def ensure_qret_on_path() -> None:
_extract_archive(archive_path, install_root)
archive_path.unlink(missing_ok=True)

if (bin_dir / "gridsynth").exists():
os.environ["GRIDSYNTH_PATH"] = str(bin_dir / "gridsynth")
gridsynth_bin = _resolve_bundled_executable(bin_dir, "gridsynth")
if gridsynth_bin is not None:
os.environ["GRIDSYNTH_PATH"] = str(gridsynth_bin)


ensure_qret_on_path()
Expand Down
Loading