Merge pull request #189 from bnavigator/fix-f2py-mod

bnavigator · web-flow · commit b72e6a9aa871 · 2022-12-19T17:06:50.000+01:00
remove -m argument from f2py .pyf generation
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/.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
@@ -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}
 )
 

Original file line number	Diff line number	Diff line change
`@@ -647,8 +647,7 @@ set(CMAKE_Fortran_FLAGS )`
`647`	`647`	`add_custom_target(wrapper ALL DEPENDS ${SLICOT_FSOURCE} ${SLYCOT_FSOURCE})`
`648`	`648`	`add_custom_command(`
`649`	`649`	`OUTPUT _wrappermodule.c _wrapper-f2pywrappers.f`
`650`		`- COMMAND ${F2PY_EXECUTABLE} -m SLYCOT`
`651`		`- ${CMAKE_CURRENT_SOURCE_DIR}/${F2PYSOURCE}`
	`650`	`+ COMMAND ${F2PY_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${F2PYSOURCE}`
`652`	`651`	`DEPENDS ${F2PYSOURCE_DEPS} ${F2PYSOURCE}`
`653`	`652`	`)`
`654`	`653`