Skip to content

Commit

Permalink
sane numpy matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
ocefpaf committed Jul 26, 2017
1 parent 28c3249 commit b8d18a7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ osx_image: xcode6.4
env:
matrix:

- CONDA_NPY=113 CONDA_PY=27
- CONDA_NPY=113 CONDA_PY=35
- CONDA_NPY=113 CONDA_PY=36
- CONDA_PY=27
- CONDA_PY=35
- CONDA_PY=36
global:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
- secure: "e7q3YO1EqC8H+r6P4zfX+qHo9BoWkTj5NWmdy/Qt2IqGcj1lX+StqJ3gtkokvzzhKNfIEnqSTU5J6YnzFolUzEWXOvTGvxYtUNB0c2FkqA5fmeYjFiJgROvAM3zwdBdn3i5iweTdt46JR/99SqD6Z6qv2swaNyyzreKpWg4DW8cC04vCtLJW84+nZ/TJwZ8JTnNpFpmUPZzKM4JaFjeR7eJcak+e7CoGgrER26pGC7qXCviSxw10But7/lYv8DWrnG5SIkrUpaA5i83NwZEbSbd+4FeSs5dxDwWCiKB7bLWCrmVkUwhPfj+6iGNMOTyW2GLxzzCYyWo5Hy7Z5bTjfJC+qjhQR20If1pPhyVvunzTK+zGxH4Wd4W0KLce02TmU/22JP6WmuzAOfymhREMvFqi6CgOMRvXAvxyBGbkFSaGW3BNE4bXxr02jeLuBq5kMRQSt1kjXschvjonFsdB7Fuvx3G78aQj9EW7bYSokdJzFBfGe4ur4D1vCoNrBr4Yf1Fk2uOy6hg/rrgznHxsMRn99wPh7V1Zp1iWUQOUaBg8Rurpwm9Nm3sjeAmteEJDDPH+D5DP9PYAq5NUVOW0lxvQQR9KBIxRWPcmryJW7r6ZxCeIfgnMzpGd29O0gSuCZZ+Wm7+jABeas4Anhg5bahAdaY8PyJbnoNYsPtMcrZM="
Expand Down
3 changes: 0 additions & 3 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,18 @@ source run_conda_forge_build_setup
# Embarking on 3 case(s).
set -x
export CONDA_NPY=113
export CONDA_PY=27
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
set -x
export CONDA_NPY=113
export CONDA_PY=35
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
set -x
export CONDA_NPY=113
export CONDA_PY=36
set +x
conda build /recipe_root --quiet || exit 1
Expand Down
2 changes: 1 addition & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export C_INCLUDE_PATH="${PREFIX}/include"
export CPLUS_INCLUDE_PATH="${PREFIX}/include"

# Depending on our platform, shared libraries end with either .so or .dylib
if [[ `uname` == 'Darwin' ]]; then
if [[ $(uname) == 'Darwin' ]]; then
# Also, included a workaround so that `-stdlib=c++` doesn't go to
# `gfortran` and cause problems.
#
Expand Down
19 changes: 11 additions & 8 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% set version = "0.19.1" %}

{% set variant = "openblas" %}


package:
name: scipy
version: {{ version }}
Expand All @@ -13,9 +11,9 @@ source:
sha256: ac268fe92edd149c6f52fa138d2a03877c080981d7944e96bab8ef68764f71cc

build:
number: 200
number: 201
# We lack openblas on Windows, and therefore can't build scipy there either currently.
skip: true # [win or np!=113]
skip: true # [win]
features:
- blas_{{ variant }}

Expand All @@ -28,19 +26,24 @@ requirements:
- cython
- blas 1.1 {{ variant }}
- libgfortran # [linux]
- openblas 0.2.19|0.2.19.*
- numpy x.x
- openblas 0.2.20
- numpy 1.9.* # [py27 or py35]
- numpy 1.11.* # [py36]
run:
- python
- blas 1.1 {{ variant }}
- libgfortran
- openblas 0.2.19|0.2.19.*
- numpy x.x
- openblas >=0.2.15
- numpy >=1.9 # [py27 or py35]
- numpy >=1.11 # [py36]

test:
requires:
- nose
- mpmath
commands:
- conda inspect linkages -p $PREFIX scipy # [not win]
- conda inspect objects -p $PREFIX scipy # [osx]

about:
home: http://www.scipy.org/
Expand Down

0 comments on commit b8d18a7

Please sign in to comment.