diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-02-22 08:53:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 08:53:06 -0500 |
| commit | d4ccb57a335dfda4b3583107767a081691352b2f (patch) | |
| tree | 43dd1892560bcc467c5eaf1373390cefe4707acd /pyfftw | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'pyfftw')
| -rw-r--r-- | pyfftw/bld.bat | 3 | ||||
| -rw-r--r-- | pyfftw/build.sh | 2 | ||||
| -rw-r--r-- | pyfftw/meta.yaml | 11 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pyfftw/bld.bat b/pyfftw/bld.bat index b290566..760380e 100644 --- a/pyfftw/bld.bat +++ b/pyfftw/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/pyfftw/build.sh b/pyfftw/build.sh index d89cf74..0651338 100644 --- a/pyfftw/build.sh +++ b/pyfftw/build.sh @@ -1,4 +1,4 @@ export CFLAGS="`pkg-config --cflags fftw3`" export LDFLAGS="`pkg-config --libs fftw3`" -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install
\ No newline at end of file diff --git a/pyfftw/meta.yaml b/pyfftw/meta.yaml index 291e754..362af0b 100644 --- a/pyfftw/meta.yaml +++ b/pyfftw/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyfftw' %} {% set version = '0.9.2' %} -{% set number = '2' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '3' %} about: home: http://hgomersall.github.com/pyFFTW @@ -22,13 +25,13 @@ requirements: - cython - pkg-config [osx] - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - cython - fftw - numpy - - python x.x + - python source: fn: pyFFTW-{{ version }}.tar.gz |