File tree Expand file tree Collapse file tree 5 files changed +4
-7
lines changed Expand file tree Collapse file tree 5 files changed +4
-7
lines changed Original file line number Diff line number Diff line change 73
73
source .venv-pyodide/bin/activate
74
74
pip install dist/*.whl
75
75
python -c "import sys; print(sys.platform)"
76
+ # TODO: when re-enabled this workflow, install test deps differently
77
+ # since ninja isn't installable with pyodide
76
78
pip install -r test_requirements.txt
77
79
- name : Test
78
80
run : |
Original file line number Diff line number Diff line change @@ -202,7 +202,6 @@ jobs:
202
202
- name : Install test dependencies
203
203
run : |
204
204
pip install -r test_requirements.txt
205
- pip install ninja
206
205
- name : Run test suite
207
206
run : |
208
207
cd tools
Original file line number Diff line number Diff line change @@ -196,7 +196,6 @@ jobs:
196
196
# TODO: Don't run test suite, and instead build wheels from sdist
197
197
# Depends on pypa/cibuildwheel#1020
198
198
python -m pip install dist/*.gz -Csetup-args=-Dallow-noblas=true
199
- pip install ninja
200
199
pip install -r test_requirements.txt
201
200
cd .. # Can't import numpy within numpy src directory
202
201
python -c "import numpy, sys; print(numpy.__version__); sys.exit(numpy.test() is False)"
Original file line number Diff line number Diff line change @@ -144,12 +144,8 @@ skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x"
144
144
build-verbosity = " 3"
145
145
before-build = " bash {project}/tools/wheels/cibw_before_build.sh {project}"
146
146
config-settings = " setup-args=-Duse-ilp64=true setup-args=-Dblas=openblas setup-args=-Dlapack=openblas setup-args=-Dblas-symbol-suffix=64_ setup-args=-Dallow-noblas=false"
147
- # meson has a hard dependency on ninja, and we need meson to build
148
- # c-extensions in tests. There is a ninja PyPI package used in
149
- # build_requirements.txt for macOS, windows, linux but it cannot be in
150
- # test_requirements.txt since pyodide, which uses test_requirements.txt, does
151
147
# not have it.
152
- before-test = " pip install ninja && pip install -r {project}/test_requirements.txt"
148
+ before-test = " pip install -r {project}/test_requirements.txt"
153
149
test-command = " bash {project}/tools/wheels/cibw_test_command.sh {project}"
154
150
155
151
[tool .cibuildwheel .linux ]
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ pytest==7.4.0
7
7
pytz==2023.3
8
8
pytest-cov==4.1.0
9
9
meson
10
+ ninja
10
11
pytest-xdist
11
12
# for numpy.random.test.test_extending
12
13
cffi; python_version < '3.10'
You can’t perform that action at this time.
0 commit comments