Skip to content

Commit 682aa64

Browse files
authored
Merge pull request #1610 from heinezen/fix/macos-ci
Add setuptools as conditionl dependency
2 parents 3c3de39 + cd135ae commit 682aa64

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/macosx-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Brew install DeJaVu fonts
5656
run: brew tap homebrew/cask-fonts && brew install font-dejavu
5757
- name: Remove python's 2to3 link so that 'brew link' does not fail
58-
run: rm '/usr/local/bin/2to3' && rm '/usr/local/bin/2to3-3.11'
58+
run: rm /usr/local/bin/2to3* && rm /usr/local/bin/idle3*
5959
- name: Install environment helpers with homebrew
6060
run: brew install ccache
6161
- name: Install dependencies with homebrew
@@ -66,7 +66,7 @@ jobs:
6666
# cython, numpy and pygments are in homebrew,
6767
# but "cython is keg-only, which means it was not symlinked into /usr/local"
6868
# numpy pulls gcc as dep? and pygments doesn't work.
69-
run: pip3 install --upgrade cython numpy mako lz4 pillow pygments toml
69+
run: pip3 install --upgrade cython numpy mako lz4 pillow pygments setuptools toml
7070
- name: Configure
7171
run: |
7272
CLANG_PATH="$HOME/clang-15.0.0/bin/clang++"

doc/building.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ Dependency list:
3232
C cython >=0.29.31
3333
C cmake >=3.16
3434
A numpy
35+
A lz4
3536
A python imaging library (PIL) -> pillow
36-
RA toml
37-
RA lz4
37+
RA setuptools (for python>=3.12 and cython<3.1)
38+
A toml
3839
CR opengl >=3.3
3940
CR libepoxy
4041
CR libpng

0 commit comments

Comments
 (0)