From 35e9ffb5a5f0dc69604821a8ce817869d9d4aca6 Mon Sep 17 00:00:00 2001 From: heinezen Date: Fri, 15 Dec 2023 17:37:37 +0100 Subject: [PATCH 1/2] ci: Fix macOS build. --- .github/workflows/macosx-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macosx-ci.yml b/.github/workflows/macosx-ci.yml index c60d76a4da..d7b86776db 100644 --- a/.github/workflows/macosx-ci.yml +++ b/.github/workflows/macosx-ci.yml @@ -55,7 +55,7 @@ jobs: - name: Brew install DeJaVu fonts run: brew tap homebrew/cask-fonts && brew install font-dejavu - name: Remove python's 2to3 link so that 'brew link' does not fail - run: rm '/usr/local/bin/2to3' && rm '/usr/local/bin/2to3-3.11' + run: rm /usr/local/bin/2to3* && rm /usr/local/bin/idle3* - name: Install environment helpers with homebrew run: brew install ccache - name: Install dependencies with homebrew @@ -66,7 +66,7 @@ jobs: # cython, numpy and pygments are in homebrew, # but "cython is keg-only, which means it was not symlinked into /usr/local" # numpy pulls gcc as dep? and pygments doesn't work. - run: pip3 install --upgrade cython numpy mako lz4 pillow pygments toml + run: pip3 install --upgrade cython numpy mako lz4 pillow pygments setuptools toml - name: Configure run: | CLANG_PATH="$HOME/clang-15.0.0/bin/clang++" From cd135ae19854a6c5fa0f257133ed27af788b68c9 Mon Sep 17 00:00:00 2001 From: heinezen Date: Fri, 15 Dec 2023 18:32:09 +0100 Subject: [PATCH 2/2] doc: Add 'setuptools' as conditional dependency. --- doc/building.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/building.md b/doc/building.md index 81d075eebb..c5b8af6180 100644 --- a/doc/building.md +++ b/doc/building.md @@ -32,9 +32,10 @@ Dependency list: C cython >=0.29.31 C cmake >=3.16 A numpy + A lz4 A python imaging library (PIL) -> pillow - RA toml - RA lz4 + RA setuptools (for python>=3.12 and cython<3.1) + A toml CR opengl >=3.3 CR libepoxy CR libpng