Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
- os: ubuntu-latest
platform_id: manylinux_x86_64

# MacOS x86_64
- os: macos-15-intel
platform_id: macosx_x86_64

# MacOS arm64
- os: macos-15
platform_id: macosx_arm64
Expand All @@ -44,11 +40,7 @@ jobs:
- name: Set macOS Deployment Target
if: runner.os == 'macOS'
run: |
if [[ "${{ matrix.os }}" == "macos-15-intel" ]]; then
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
elif [[ "${{ matrix.os }}" == "macos-15" ]]; then
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
fi
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV

- name: Install Boost
if: runner.os == 'Windows'
Expand Down
23 changes: 3 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-15-intel, macos-15, windows-latest] # Intel linux, Intel Mac, ARM Mac, Windows
os: [ubuntu-latest, macos-15, windows-latest] # Intel linux, ARM Mac, Windows

steps:
- uses: actions/checkout@v6
Expand All @@ -43,7 +43,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-15-intel, macos-15, windows-latest] # Intel linux, Intel Mac, ARM Mac, Windows
os: [ubuntu-latest, macos-15, windows-latest] # Intel linux, ARM Mac, Windows
python-version: ["3.12", "3.13", "3.14"]
steps:
- uses: actions/checkout@v6
Expand All @@ -59,23 +59,7 @@ jobs:
- name: Install llvm (macOS)
if: runner.os == 'macOS'
run: |
if [[ "$(uname -m)" == "arm64" ]]; then
brew install llvm
else
brew install llvm

brew install llvm@20

LLVM20_PREFIX="$(brew --prefix llvm@20)"

echo "PATH=$LLVM20_PREFIX/bin:$PATH" >> $GITHUB_ENV
echo "LLVM_CONFIG=$LLVM20_PREFIX/bin/llvm-config" >> $GITHUB_ENV
echo "LLVM_DIR=$LLVM20_PREFIX/lib/cmake/llvm" >> $GITHUB_ENV
echo "CMAKE_PREFIX_PATH=$LLVM20_PREFIX/lib/cmake:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
echo "LDFLAGS=-L$LLVM20_PREFIX/lib $LDFLAGS" >> $GITHUB_ENV
echo "CPPFLAGS=-I$LLVM20_PREFIX/include $CPPFLAGS" >> $GITHUB_ENV
fi

brew install llvm

- name: Install llvm (Windows)
if: runner.os == 'Windows'
Expand All @@ -88,7 +72,6 @@ jobs:
nox -s test-${{ matrix.python-version }} -- --cov --cov-report=lcov:${{matrix.os}}-${{matrix.python-version}}.lcov --cov-report=term --cov-append --durations=20

- name: Coveralls Parallel
if: matrix.os != 'macos-15-intel'
uses: coverallsapp/github-action@v2
with:
parallel: true
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ jobs:
# manylinux x86_64
- os: ubuntu-latest
platform_id: manylinux_x86_64

# MacOS x86_64
- os: macos-15-intel
platform_id: macosx_x86_64

# MacOS arm64
- os: macos-15
Expand All @@ -44,11 +40,7 @@ jobs:
- name: Set macOS Deployment Target
if: runner.os == 'macOS'
run: |
if [[ "${{ matrix.os }}" == "macos-15-intel" ]]; then
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
elif [[ "${{ matrix.os }}" == "macos-15" ]]; then
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
fi
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV

- name: Install Boost
if: runner.os == 'Windows'
Expand Down
5 changes: 3 additions & 2 deletions docs/developers/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ There could be several reasons `piqtree` doesn't install correctly.

### Check your operating system is supported

At this stage, we currently only support x86-64 linux, and x86-64 and ARM macOS.
At this stage, we currently only support x86-64 linux, x86-64 Windows, and ARM macOS.

### Check the IQ-TREE library is up-to-date

Expand All @@ -28,9 +28,10 @@ There could be several reasons `piqtree` doesn't build.

### Check your operating system is supported

At this stage, we currently only support x86-64 linux, and x86-64 and ARM macOS.
At this stage, we currently only support x86-64 linux, x86-64 Windows, and ARM macOS.

### Check dependencies have been installed

- If on Windows, try running `./before_all_windows.sh` which will also install dependencies.
- If on macOS, try running `./before_all_mac.sh` which will also install dependencies.
- If on linux, try installing the dependencies listed at the top of `.devcontainer/DockerFile`