Skip to content
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

Add setuptools as conditionl dependency #1610

Merged
merged 2 commits into from
Dec 15, 2023
Merged

Add setuptools as conditionl dependency #1610

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
35e9ffb
ci: Fix macOS build.
heinezen Dec 15, 2023
cd135ae
doc: Add 'setuptools' as conditional dependency.
heinezen Dec 15, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/macosx-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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++"
Expand Down
5 changes: 3 additions & 2 deletions doc/building.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down