Merge 8e141ca into 1bf49c1

conda-recipe-apple/build.sh

@@ -1,6 +1,15 @@
+cd $RECIPE_DIR/..
+
+# ensure we are not building with old cmake files
+rm -rf _skbuild
+rm -rf _cmake_test_compile
+
 export LDFLAGS="$LDFLAGS -v"
 if [[ "$target_platform" == osx-64 ]]; then
   export LDFLAGS="${LDFLAGS} -isysroot ${CONDA_BUILD_SYSROOT}"
   export CFLAGS="${CFLAGS} -isysroot ${CONDA_BUILD_SYSROOT}"
 fi
-$PYTHON setup.py build_ext install -- -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT}
+
+$PYTHON setup.py build_ext install -- \
+	-DNumPy_INCLUDE_DIR=${SP_DIR}/numpy/core/include \
+	-DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT}

conda-recipe-apple/meta.yaml

@@ -7,28 +7,37 @@ source:
 
 build:
   number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
-  string: py{{ environ.get('PY_VER').replace('.', '') }}{{ environ.get('GIT_DESCRIBE_HASH', '') }}_mkl_{{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+  string: py{{ environ.get('PY_VER').replace('.', '') }}{{ environ.get('GIT_DESCRIBE_HASH', '') }}_obl_{{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
 
 requirements:
   build:
     - {{ compiler('c') }}       
     - {{ compiler('fortran') }}   # [unix]
     - flang                       # [win]
+    - cmake
 
   host:
     - numpy
     - python
+    - openblas
+    - python
     # conda-forge::scikit-build>=0.10.0 includes MACOSX_DEPLOYMENT_TARGET
     # patches from https://github.com/scikit-build/scikit-build/pull/441
     - scikit-build >=0.10.0
 
   run:
     - python
     - {{ pin_compatible('numpy') }}
+    - libopenblas
 
 test:
+  requires:
+    - pytest
+    - scipy
   imports:
     - slycot
+  commands:
+    - pytest --pyargs slycot
 
 about:
   home: https://github.com/python-control/Slycot

conda-recipe-mkl/build.sh

@@ -1,10 +1,10 @@
 cd $RECIPE_DIR/..
 
-# specify blas vendor should be MKL
-export BLA_VENDOR=Intel10_64lp
-
 # ensure we are not building with old cmake files
 rm -rf _skbuild
+rm -rf _cmake_test_compile
 
 # do the build
-$PYTHON -m pip install . --no-deps --ignore-installed -vv
+$PYTHON setup.py build_ext -lmkl install -- \
+	-DNumPy_INCLUDE_DIR=${SP_DIR}/numpy/core/include \
+	-DBLA_VENDOR=Intel10_64lp

conda-recipe-mkl/meta.yaml

@@ -14,22 +14,28 @@ requirements:
     - {{ compiler('c') }}       
     - {{ compiler('fortran') }}   # [unix]
     - flang                       # [win]
+    - cmake
+    - numpy
 
   host:
     - numpy
     - mkl
     - python
     - scikit-build
-    - pip
 
   run:
     - python {{ PY_VER }}
     - {{ pin_compatible('numpy') }}
     - mkl
 
 test:
+  requires:
+    - pytest
+    - scipy
   imports:
     - slycot
+  commands:
+    - pytest --pyargs slycot
 
 about:
   home: https://github.com/python-control/Slycot

conda-recipe-openblas/build.sh

@@ -1,11 +1,11 @@
 cd $RECIPE_DIR/..
 
-# specify blas vendor should be OpenBLAS
-export BLA_VENDOR=OpenBLAS
-
 # ensure we are not building with old cmake files
 rm -rf _skbuild
+rm -rf _cmake_test_compile
 
 # do the build
-$PYTHON -m pip install . --no-deps --ignore-installed -vv
+$PYTHON setup.py build_ext install -- \
+	-DNumPy_INCLUDE_DIR=${SP_DIR}/numpy/core/include \
+	-DBLA_VENDOR=OpenBLAS
 

conda-recipe-openblas/meta.yaml

@@ -14,22 +14,28 @@ requirements:
     - {{ compiler('c') }}       
     - {{ compiler('fortran') }}   # [unix]
     - flang                       # [win]
+    - cmake
 
   host:
     - numpy
     - libopenblas
+    - openblas
     - python
     - scikit-build
-    - pip
 
   run:
     - python {{ PY_VER }}
     - {{ pin_compatible('numpy') }}
     - libopenblas
-
+   
 test:
+  requires:
+    - pytest
+    - scipy
   imports:
     - slycot
+  commands:
+    - pytest --pyargs slycot
 
 about:
   home: https://github.com/python-control/Slycot