Skip to content

Commit

Permalink
Merge pull request #178 from python-control/no-np1.23
Browse files Browse the repository at this point in the history
Work around numpy/numpy#21889
  • Loading branch information
bnavigator authored Jun 30, 2022
2 parents 4f98dac + d5769a4 commit e162b5f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/conda-env/build-env.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build-env
dependencies:
- boa
- numpy
- numpy!=1.23.0
1 change: 0 additions & 1 deletion .github/workflows/slycot-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ jobs:
shell: bash -l {0}
run: |
set -e
mamba install boa numpy
numpyversion=$(python -c 'import numpy; print(numpy.version.version)')
conda mambabuild --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe
# preserve directory structure for custom conda channel
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ requirements:
- libcblas * *netlib
- liblapack * *netlib
- python
- numpy
- numpy!=1.23.0
- pip
- scikit-build >=0.14.1

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ requires = [
"wheel",
"scikit-build>=0.14.1",
"cmake",
"numpy"]
"numpy!=1.23.0"]
build-backend = "setuptools.build_meta"

0 comments on commit e162b5f

Please sign in to comment.