diff --git a/.github/conda-env/build-env.yml b/.github/conda-env/build-env.yml index d932718f..f7597364 100644 --- a/.github/conda-env/build-env.yml +++ b/.github/conda-env/build-env.yml @@ -1,4 +1,4 @@ name: build-env dependencies: - boa - - numpy <1.24 + - numpy !=1.23.0 diff --git a/.github/conda-env/test-env.yml b/.github/conda-env/test-env.yml index ac47f1ed..7d69d330 100644 --- a/.github/conda-env/test-env.yml +++ b/.github/conda-env/test-env.yml @@ -8,4 +8,4 @@ dependencies: - pytest-cov - pytest-timeout - coverage - - coveralls + - coveralls >= 3.3 diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 8ee41ce3..1f3314db 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: - libcblas * *netlib - liblapack * *netlib - python - - numpy <1.24 + - numpy !=1.23.0 - pip - scikit-build >=0.15 - setuptools >=45 diff --git a/pyproject.toml b/pyproject.toml index cb13a95e..94af52dd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,7 @@ requires = [ "wheel", "scikit-build>=0.15", "cmake>=3.14", - # python-control/Slycot/issues/187 - "numpy<1.24"] + "numpy!=1.23.0"] build-backend = "setuptools.build_meta" [project] diff --git a/slycot/CMakeLists.txt b/slycot/CMakeLists.txt index 46980725..eb49edd1 100644 --- a/slycot/CMakeLists.txt +++ b/slycot/CMakeLists.txt @@ -647,8 +647,7 @@ set(CMAKE_Fortran_FLAGS ) add_custom_target(wrapper ALL DEPENDS ${SLICOT_FSOURCE} ${SLYCOT_FSOURCE}) add_custom_command( OUTPUT _wrappermodule.c _wrapper-f2pywrappers.f - COMMAND ${F2PY_EXECUTABLE} -m SLYCOT - ${CMAKE_CURRENT_SOURCE_DIR}/${F2PYSOURCE} + COMMAND ${F2PY_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${F2PYSOURCE} DEPENDS ${F2PYSOURCE_DEPS} ${F2PYSOURCE} )