Skip to content

Commit

Permalink
CI: ninja packages are repaired, so unpin.
Browse files Browse the repository at this point in the history
  • Loading branch information
WarrenWeckesser committed Nov 6, 2022
1 parent f18fc7a commit 04949fe
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -78,7 +78,7 @@ jobs:
pip install numpy==1.21.5
pip install -r doc_requirements.txt
# `asv` pin because of slowdowns reported in gh-15568
pip install mpmath gmpy2 "asv==0.4.2" pythran ninja==1.10.2.4 meson click rich-click doit pydevtool pooch
pip install mpmath gmpy2 "asv==0.4.2" pythran ninja meson click rich-click doit pydevtool pooch
pip install pybind11
# extra benchmark deps
pip install pyfftw cffi pytest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux_meson.yml
Expand Up @@ -61,13 +61,13 @@ jobs:
- name: Install Python packages
if: matrix.python-version == '3.9'
run: |
python -m pip install numpy cython pytest pytest-xdist pytest-timeout pybind11 mpmath gmpy2 pythran ninja==1.10.2.4 meson click rich-click doit pydevtool pooch
python -m pip install numpy cython pytest pytest-xdist pytest-timeout pybind11 mpmath gmpy2 pythran ninja meson click rich-click doit pydevtool pooch
- name: Install Python packages from repositories
if: matrix.python-version == '3.11-dev'
run: |
python -m pip install git+https://github.com/numpy/numpy.git
python -m pip install ninja==1.10.2.4 cython pytest pybind11 pytest-xdist pytest-timeout click rich-click doit pydevtool pooch
python -m pip install ninja cython pytest pybind11 pytest-xdist pytest-timeout click rich-click doit pydevtool pooch
python -m pip install git+https://github.com/serge-sans-paille/pythran.git
python -m pip install git+https://github.com/mesonbuild/meson.git
Expand Down
6 changes: 3 additions & 3 deletions ci/cirrus_general_ci.yml
Expand Up @@ -31,7 +31,7 @@ linux_aarch64_test_task:
ln -s $(which python3.10) python
export PATH=$PWD:$PATH
python -m pip install meson ninja==1.10.2.4 numpy cython pybind11 pythran cython
python -m pip install meson ninja numpy cython pybind11 pythran cython
python -m pip install click rich_click doit pydevtool
python -m pip install pytest pooch
Expand Down Expand Up @@ -60,7 +60,7 @@ musllinux_amd64_test_task:
python_dependencies_script: |
python -m pip install cython
python -m pip install -vvv --upgrade numpy
python -m pip install meson ninja==1.10.2.4 pybind11 pythran pytest
python -m pip install meson ninja pybind11 pythran pytest
python -m pip install click rich_click doit pydevtool pooch
build_script: |
Expand Down Expand Up @@ -93,7 +93,7 @@ macos_arm64_test_task:
source scipy-dev/bin/activate
popd
python -m pip install meson ninja==1.10.2.4 numpy cython pybind11 pythran cython
python -m pip install meson ninja numpy cython pybind11 pythran cython
python -m pip install click rich_click doit pydevtool
python -m pip install pytest pooch
export DYLD_LIBRARY_PATH=/usr/local/gfortran/lib:/opt/arm64-builds/lib
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Expand Up @@ -13,7 +13,7 @@ dependencies:
- compilers
- meson>=0.63.0
- meson-python
- ninja==1.10.2
- ninja
- numpy
- openblas
- pkg-config # note: not available on Windows
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Expand Up @@ -10,7 +10,6 @@
[build-system]
build-backend = 'mesonpy'
requires = [
"ninja==1.10.2",
"meson-python>=0.9.0",
"Cython>=0.29.32",
"pybind11>=2.10.0",
Expand Down

0 comments on commit 04949fe

Please sign in to comment.