remove -m argument from f2py .pyf generation

remove numpy pins fixes gh-187
python-control · Dec 19, 2022 · 9fec0d0 · 9fec0d0
1 parent c71e69c
commit 9fec0d0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git 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/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
@@ -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
@@ -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}
 )