Skip to content

Commit 27d4b54

Browse files
committed
Install numpy and fix up CI testing for source builds
1 parent c343f39 commit 27d4b54

2 files changed

Lines changed: 13 additions & 17 deletions

File tree

.github/workflows/buildwheel.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
CIBW_BEFORE_ALL_MACOS: bin/cibw_before_all_macosx_x86_64.sh
4343
CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
4444
CIBW_BEFORE_BUILD_WINDOWS: msys2 -c bin/cibw_before_build_windows.sh
45-
CIBW_BEFORE_BUILD: pip install cython delvewheel
45+
CIBW_BEFORE_BUILD: pip install numpy setuptools cython delvewheel
4646
CIBW_ENVIRONMENT: >
4747
C_INCLUDE_PATH=$(pwd)/.local/include/
4848
LIBRARY_PATH=$(pwd)/.local/lib/
@@ -99,21 +99,17 @@ jobs:
9999
test_pip_linux_vcs:
100100
name: Install from git checkout on Ubuntu
101101
runs-on: ubuntu-22.04
102+
strategy:
103+
fail-fast: false
104+
matrix:
105+
python-version: ['3.11', '3.12']
106+
# '.' means install from git checkout
107+
# 'python-flint' means install from PyPI sdist
108+
target: ['.', 'python-flint']
102109
steps:
103110
- uses: actions/checkout@v3
104111
- uses: actions/setup-python@v4
105112
with:
106-
python-version: 3.12
107-
- run: bin/pip_install_ubuntu.sh . # Install from checkout
108-
- run: python -m flint.test --verbose
109-
110-
test_pip_linux_pypi:
111-
name: Install from PyPI sdist on Ubuntu
112-
runs-on: ubuntu-22.04
113-
steps:
114-
- uses: actions/checkout@v3
115-
- uses: actions/setup-python@v4
116-
with:
117-
python-version: 3.11
118-
- run: bin/pip_install_ubuntu.sh python-flint # Install from PyPI sdist
113+
python-version: ${{ matrix.python-version }}
114+
- run: bin/pip_install_ubuntu.sh ${{ matrix.target }}
119115
- run: python -m flint.test --verbose

bin/pip_install_ubuntu.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ sudo ldconfig /usr/local/lib
4343

4444
# Python build requirements. Ideally these would be in pyproject.toml, but
4545
# first need to migrate from setup.py to pyproject.toml.
46-
pip install 'cython>=3' setuptools wheel
46+
pip install numpy cython setuptools wheel
4747

4848
# Install from checkout (or sdist).
4949
echo -----------------------------------------------------------
5050
echo
5151
echo Running:
52-
echo $ pip install --no-build-isolation $1
52+
echo $ pip install --no-binary :all: --no-build-isolation $1
5353
echo
5454
echo -----------------------------------------------------------
5555

56-
pip install --no-build-isolation $1
56+
pip install --no-binary :all: --no-build-isolation $1

0 commit comments

Comments
 (0)