8000 Merge pull request #25438 from rgommers/ninja-test-req · numpy/numpy@021787a · GitHub
[go: up one dir, main page]
Skip to content

Commit 021787a

Browse files
rgommersrgommers
authored
Merge pull request #25438 from rgommers/ninja-test-req
DEV: add `ninja` to `test_requirements.txt` and clean up related comment
2 parents 4dde4c0 + d815ef3 commit 021787a

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

‎.github/workflows/emscripten.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
source .venv-pyodide/bin/activate
7474
pip install dist/*.whl
7575
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
7678
pip install -r test_requirements.txt
7779
- name: Test
7880
run: |

‎.github/workflows/linux.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ jobs:
202202
- name: Install test dependencies
203203
run: |
204204
pip install -r test_requirements.txt
205-
pip install ninja
206205
- name: Run test suite
207206
run: |
208207
cd tools

‎.github/workflows/wheels.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ jobs:
196196
# TODO: Don't run test suite, and instead build wheels from sdist
197197
# Depends on pypa/cibuildwheel#1020
198198
python -m pip install dist/*.gz -Csetup-args=-Dallow-noblas=true
199-
pip install ninja
200199
pip install -r test_requirements.txt
201200
cd .. # Can't import numpy within numpy src directory
202201
python -c "import numpy, sys; print(numpy.__version__); sys.exit(numpy.test() is False)"

‎pyproject.toml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,8 @@ skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x"
144144
build-verbosity = "3"
145145
before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
146146
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
151147
# 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"
153149
test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
154150

155151
[tool.cibuildwheel.linux]

‎test_requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pytest==7.4.0
77
pytz==2023.3
88
pytest-cov==4.1.0
99
meson
10+
ninja
1011
pytest-xdist
1112
# for numpy.random.test.test_extending
1213
cffi; python_version < '3.10'

0 commit comments

Comments
 (0)
0