From b5d6cd7bfab62fd7fb96570cf99b87aeed419a4d Mon Sep 17 00:00:00 2001 From: Mario Mulansky Date: Wed, 4 Oct 2017 20:03:08 -0700 Subject: Bump version --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b53304b..f2315f2 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ to compile cython files: python setup.py build_ext --inplace -Copyright 2014-2016, Mario Mulansky +Copyright 2014-2017, Mario Mulansky Distributed under the BSD License @@ -55,7 +55,7 @@ elif use_c: # c files are there, compile to binaries setup( name='pyspike', packages=find_packages(exclude=['doc']), - version='0.5.1', + version='0.5.2', cmdclass=cmdclass, ext_modules=ext_modules, include_dirs=[numpy.get_include()], @@ -72,7 +72,7 @@ train similarity', # 3 - Alpha # 4 - Beta # 5 - Production/Stable - 'Development Status :: 3 - Alpha', + 'Development Status :: 3 - Beta', # Indicate who your project is intended for 'Intended Audience :: Science/Research', @@ -82,12 +82,12 @@ train similarity', 'License :: OSI Approved :: BSD License', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6' ] ) -- cgit v1.2.3 From ecd4b5f0f7e93859c1262593e2c09e1eb6775819 Mon Sep 17 00:00:00 2001 From: Dan Meliza Date: Mon, 2 Oct 2017 12:15:36 -0400 Subject: defer numpy import to allow install_requires to do its job (fixes #24) --- Changelog | 6 ++++++ setup.py | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/Changelog b/Changelog index 2be5e52..21b7cb0 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,9 @@ +PySpike v0.5: + * First beta release + * Python 2.6 support removed + * Python 3.6 support added + * several bugfixes + PySpike v0.4: * Python 3 support (thanks to Igor Gnatenko) * list interface to SpikeTrain class diff --git a/setup.py b/setup.py index f2315f2..afcfa16 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ Distributed under the BSD License from setuptools import setup, find_packages from distutils.extension import Extension import os.path -import numpy try: from Cython.Distutils import build_ext @@ -21,6 +20,14 @@ except ImportError: else: use_cython = True + +class numpy_include(object): + """Defers import of numpy until install_requires is through""" + def __str__(self): + import numpy + return numpy.get_include() + + if os.path.isfile("pyspike/cython/cython_add.c") and \ os.path.isfile("pyspike/cython/cython_profiles.c") and \ os.path.isfile("pyspike/cython/cython_distances.c"): @@ -58,7 +65,7 @@ setup( version='0.5.2', cmdclass=cmdclass, ext_modules=ext_modules, - include_dirs=[numpy.get_include()], + include_dirs=[numpy_include()], description='A Python library for the numerical analysis of spike\ train similarity', author='Mario Mulansky', -- cgit v1.2.3