Skip to content

Commit

Permalink
[pre-commit.ci] pre-commit autoupdate (#653)
Browse files Browse the repository at this point in the history
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
pre-commit-ci[bot] committed Apr 30, 2024
1 parent 2b0db57 commit 22a02d6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
21 changes: 13 additions & 8 deletions .github/workflows/build_and_test.yml
Expand Up @@ -61,7 +61,7 @@ jobs:
python: cmake
windows_compiler: msvc
slow: false
- os: macos-latest
- os: macos-13
blas: OpenBLAS
blas_linking: dynamic
python: cmake
Expand Down Expand Up @@ -93,8 +93,8 @@ jobs:
blas_linking: static
- os: ubuntu-20.04
blas: mkl-findblas
- os: macos-latest
blas: mkl-findblas
- os: macos-13
blas: mkl-findblas # only available on Intel
blas_linking: static
# One without Python but with VTK (once we fix it!)
- os: ubuntu-22.04
Expand Down Expand Up @@ -243,11 +243,11 @@ jobs:
pip --version
pip install --upgrade -q pip
if [[ ${{steps.env-vars.outputs.os}} == 'windows'* ]]; then
EXTRA_PIP=delvewheel
EXTRA_PIP="delvewheel pytest<8.0.0"
elif [[ ${{steps.env-vars.outputs.os}} == 'macos'* ]]; then
EXTRA_PIP=delocate
EXTRA_PIP="delocate pytest"
else
EXTRA_PIP=auditwheel
EXTRA_PIP="auditwheel pytest"
fi
if [[ "${{steps.env-vars.outputs.numpy_version}}" == 'dev' ]]; then
echo "Installing NumPy main"
Expand All @@ -263,7 +263,8 @@ jobs:
pip install --upgrade --pre --only-binary ":all:" "numpy>=2.0.0rc1,<3"
fi
fi
pip install --upgrade --progress-bar off --only-binary="numpy" -q setuptools wheel twine "pytest!=8.0.0,!=8.0.1,!=8.0.2" threadpoolctl $EXTRA_PIP
pip install --upgrade --progress-bar off --only-binary="numpy" -q setuptools wheel twine threadpoolctl $EXTRA_PIP
- name: MKL setup - mkl via conda
if: startswith(steps.env-vars.outputs.blas,'mkl')
Expand Down Expand Up @@ -347,7 +348,11 @@ jobs:
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install hdf5 libmatio@1.5.26 libomp swig $BREW_EXTRA
echo "brew install complete"
if [[ "${{steps.env-vars.outputs.blas}}" == "OpenBLAS" ]]; then
BLAS_DIR=/usr/local/opt/openblas
if [[ "$(arch)" == "arm64" ]]; then
BLAS_DIR=/opt/homebrew/opt/openblas
else
BLAS_DIR=/usr/local/opt/openblas
fi
OPENBLAS_INCLUDE=$BLAS_DIR/include
OPENBLAS_LIB=$BLAS_DIR/lib
echo "Checking for $OPENBLAS_INCLUDE"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Expand Up @@ -4,7 +4,7 @@ repos:
hooks:
- id: check-yaml
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.1
rev: v0.4.2
hooks:
- id: ruff
name: ruff lint
Expand Down
6 changes: 5 additions & 1 deletion wrapping/python/pyproject.toml
Expand Up @@ -14,7 +14,11 @@ skip = "cp36-* cp37-* cp38-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux* *-w
build-verbosity = 3
before-all = "bash {project}/build_tools/cibw_before_all.sh {project}"
# pytest 8.0: https://github.com/pytest-dev/pytest/issues/11884
test-requires = ["pytest!=8.0.0,!=8.0.1,!=8.0.2,!=8.1.1", "threadpoolctl"]
test-requires = [
"pytest!=8.0.0,!=8.0.1,!=8.0.2,!=8.1.1,!=8.1.2,!=8.2.0;platform_system=='Windows'",
"pytest;platform_system!='Windows'",
"threadpoolctl",
]
test-command = "bash {project}/build_tools/cibw_test_command.sh {project}"

[tool.cibuildwheel.linux]
Expand Down

0 comments on commit 22a02d6

Please sign in to comment.