Merge pull request #25438 from rgommers/ninja-test-req

rgommers · web-flow · commit 021787a600ce · 2023-12-20T22:05:13.000+01:00
DEV: add `ninja` to `test_requirements.txt` and clean up related comment
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
@@ -73,6 +73,8 @@ jobs:
           source .venv-pyodide/bin/activate
           pip install dist/*.whl
           python -c "import sys; print(sys.platform)"
+          # TODO: when re-enabled this workflow, install test deps differently
+          # since ninja isn't installable with pyodide
           pip install -r test_requirements.txt
       - name: Test
         run: |
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -202,7 +202,6 @@ jobs:
     - name: Install test dependencies
       run: |
         pip install -r test_requirements.txt
-        pip install ninja
     - name: Run test suite
       run: |
         cd tools
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -196,7 +196,6 @@ jobs:
           # TODO: Don't run test suite, and instead build wheels from sdist
           # Depends on pypa/cibuildwheel#1020
           python -m pip install dist/*.gz -Csetup-args=-Dallow-noblas=true
-          pip install ninja
           pip install -r test_requirements.txt
           cd .. # Can't import numpy within numpy src directory
           python -c "import numpy, sys; print(numpy.__version__); sys.exit(numpy.test() is False)"
diff --git a/pyproject.toml b/pyproject.toml
@@ -144,12 +144,8 @@ skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x"
 build-verbosity = "3"
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
 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"
-# meson has a hard dependency on ninja, and we need meson to build
-# c-extensions in tests. There is a ninja PyPI package used in
-# build_requirements.txt for macOS, windows, linux but it cannot be in
-# test_requirements.txt since pyodide, which uses test_requirements.txt, does
 # not have it.
-before-test = "pip install ninja && pip install -r {project}/test_requirements.txt"
+before-test = "pip install -r {project}/test_requirements.txt"
 test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 
 [tool.cibuildwheel.linux]
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -7,6 +7,7 @@ pytest==7.4.0
 pytz==2023.3
 pytest-cov==4.1.0
 meson
+ninja
 pytest-xdist
 # for numpy.random.test.test_extending
 cffi; python_version < '3.10'
