Skip to content

Run tests on conda build #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryyorke merged 5 commits into from
May 10, 2020
Merged

Run tests on conda build #115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d9964e
Merge pull request #1 from python-control/master
repagh May 2, 2020
ed070ca
modify conda build recipes to perform the unit tests
repagh May 2, 2020
d0c4560
use pytest for running the tests
repagh May 3, 2020
8e141ca
conda recipe fixes
repagh May 3, 2020
ee46807
force looking for and use of accelerate for apple
repagh May 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
modify conda build recipes to perform the unit tests
  • Loading branch information
@repagh
repagh committed May 2, 2020
commit ed070cabd77f4845f1aa9354f303faa2012574fe
11 changes: 10 additions & 1 deletion conda-recipe-apple/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
4 changes: 4 additions & 0 deletions conda-recipe-apple/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('fortran') }} # [unix]
- flang # [win]
- cmake

host:
- numpy
Expand All @@ -29,6 +30,9 @@ requirements:
test:
imports:
- slycot
commands:
- conda install nose pytest scipy parameterized --yes --quiet

@roryyorke roryyorke May 3, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need nose and pytest ?

@roryyorke roryyorke May 3, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, isn't there a requires subsection for the test section (e.g., https://github.com/conda-forge/slycot-feedstock/blob/10ef9af7b10ce29ef7ba6e370ea6e0e5a1021b52/recipe/meta.yaml#L38)

@bnavigator bnavigator May 3, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need nose and pytest ?

no only pytest

@repagh repagh May 3, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea, I was looking for that requires section....

@repagh repagh May 3, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I like the conda recipes, as a step up to the feedstock. I use them both on osx and Linux.

- python -c "from slycot import test; test()"

about:
home: https://github.com/python-control/Slycot
Expand Down
8 changes: 4 additions & 4 deletions conda-recipe-mkl/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion conda-recipe-mkl/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('fortran') }} # [unix]
- flang # [win]
- cmake
- numpy

host:
- numpy
- mkl
- python
- scikit-build
- pip

run:
- python {{ PY_VER }}
Expand All @@ -30,6 +31,9 @@ requirements:
test:
imports:
- slycot
commands:
- conda install nose pytest scipy parameterized --yes --quiet
- python -c "from slycot import test; test()"

@bnavigator bnavigator May 3, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you install pytest, why not run pytest?

@repagh repagh May 3, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. Will convert to pytest and a "Requires:" section. Thanks for the suggestions.


about:
home: https://github.com/python-control/Slycot
Expand Down
8 changes: 4 additions & 4 deletions conda-recipe-openblas/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

9 changes: 7 additions & 2 deletions conda-recipe-openblas/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,27 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('fortran') }} # [unix]
- flang # [win]
- cmake
- numpy

host:
- numpy
- libopenblas
- openblas
- python
- scikit-build
- pip

run:
- python {{ PY_VER }}
- {{ pin_compatible('numpy') }}
- libopenblas

test:
imports:
- slycot
commands:
- conda install nose pytest scipy parameterized --yes --quiet
- python -c "from slycot import test; test()"

about:
home: https://github.com/python-control/Slycot
Expand Down