Skip to content

Commit

Permalink
Merge pull request #29 from bmcfee/014-release
Browse files Browse the repository at this point in the history
pre-release for 0.1.4
  • Loading branch information
bmcfee committed Jul 13, 2016
2 parents 34b6d16 + e6ed8e7 commit 8f7ea38
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 6 deletions.
5 changes: 5 additions & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changes
-------

v0.1.4
~~~~~~

- `#27 <https://github.com/bmcfee/resampy/pull/27>`_ Fixed cython packaging

v0.1.3
~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion resampy/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"""Version info"""

short_version = '0.1'
version = '0.1.3'
version = '0.1.4'
27 changes: 22 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
'''resampy install script'''
import imp
import sys

from setuptools import setup
from Cython.Build import cythonize

from setuptools import setup, Extension
import numpy as np


USE_CYTHON = False
EXT = '.c'

if 'build_ext' in sys.argv:
from Cython.Build import cythonize
USE_CYTHON = True
EXT = '.pyx'


VERSION = imp.load_source('resampy.version', 'resampy/version.py')

sourcefiles = ['resampy/interp' + EXT]
extensions = [Extension('resampy.interp',
['resampy/interp' + EXT],
include_dirs=[np.get_include()])]

if USE_CYTHON:
extensions = cythonize(extensions)


setup(
author="Brian McFee",
author_email="brian.mcfee@nyu.edu",
Expand All @@ -17,8 +35,7 @@
download_url='https://github.com/bmcfee/resampy/releases',
description='Efficient signal resampling',
license='ISC',
ext_modules=cythonize('resampy/*.pyx', include_path=[np.get_include()]),
include_dirs=[np.get_include()],
ext_modules=extensions,
packages=['resampy'],
package_data={'resampy': ['data/*']},
install_requires=[
Expand Down

0 comments on commit 8f7ea38

Please sign in to comment.