From 61a9785822d402d5269bdff608f6259c1b6bffa4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 13 Dec 2015 11:04:33 +0100 Subject: add metadata and testing under py3 Signed-off-by: Igor Gnatenko --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 960c684..0bd9173 100644 --- a/setup.py +++ b/setup.py @@ -89,6 +89,11 @@ train similarity', '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', ], package_data={ 'pyspike': ['cython/cython_add.c', 'cython/cython_profiles.c', -- cgit v1.2.3 From 692a5773c85e08a690bc5406147e58c4f10b6628 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 13 Dec 2015 11:17:37 +0100 Subject: stop using package_data Signed-off-by: Igor Gnatenko --- MANIFEST.in | 7 +++++++ setup.py | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 MANIFEST.in (limited to 'setup.py') diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..aed0ae0 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,7 @@ +include *.rst +include *.txt +include pyspike/cython/*.c +include directionality/cython/*.c +recursive-include examples *.py *.txt +recursive-include test *.py *.txt +recursive-include doc * diff --git a/setup.py b/setup.py index 0bd9173..62c1951 100644 --- a/setup.py +++ b/setup.py @@ -94,11 +94,5 @@ train similarity', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', - ], - package_data={ - 'pyspike': ['cython/cython_add.c', 'cython/cython_profiles.c', - 'cython/cython_distances.c', - 'directionality/cython/cython_directionality.c'], - 'test': ['Spike_testdata.txt'] - } + ] ) -- cgit v1.2.3 From 64b680238ac5bcafbf3ce67ed2a4d7487098b43d Mon Sep 17 00:00:00 2001 From: Mario Mulansky Date: Mon, 14 Dec 2015 16:40:49 +0100 Subject: update version strings and Changelog --- Changelog | 6 ++++++ doc/conf.py | 4 ++-- setup.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/Changelog b/Changelog index 519dd3b..2be5e52 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,9 @@ +PySpike v0.4: + * Python 3 support (thanks to Igor Gnatenko) + * list interface to SpikeTrain class + * disable_backend_warning property + * several bugfixes + PySpike v0.3: * addition of __version__ attribute * restructured docs, Readme now only contains basic examples diff --git a/doc/conf.py b/doc/conf.py index 8011ea9..7e13eae 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -64,9 +64,9 @@ copyright = u'2014-2015, Mario Mulansky' # built documents. # # The short X.Y version. -version = '0.3' +version = '0.4' # The full version, including alpha/beta/rc tags. -release = '0.3.0' +release = '0.4.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 62c1951..a1ab122 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ elif use_c: # c files are there, compile to binaries setup( name='pyspike', packages=find_packages(exclude=['doc']), - version='0.3.0', + version='0.4.0', cmdclass=cmdclass, ext_modules=ext_modules, include_dirs=[numpy.get_include()], -- cgit v1.2.3 From 9061f2a0c13134e53f937d730295a421fd671ea3 Mon Sep 17 00:00:00 2001 From: Mario Mulansky Date: Mon, 14 Dec 2015 16:50:55 +0100 Subject: removed directionality from __init__ and setup.py --- pyspike/__init__.py | 2 -- setup.py | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'setup.py') diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 335b1d3..069090b 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -26,8 +26,6 @@ from .psth import psth from .spikes import load_spike_trains_from_txt, spike_train_from_string, \ merge_spike_trains, generate_poisson_spikes -from . import directionality as drct - # define the __version__ following # http://stackoverflow.com/questions/17583443 from pkg_resources import get_distribution, DistributionNotFound diff --git a/setup.py b/setup.py index a1ab122..8ef431a 100644 --- a/setup.py +++ b/setup.py @@ -23,8 +23,7 @@ else: 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") and \ - os.path.isfile("pyspike/directionality/cython/cython_directionality.c"): + os.path.isfile("pyspike/cython/cython_distances.c"): use_c = True else: use_c = False @@ -39,9 +38,7 @@ if use_cython: # Cython is available, compile .pyx -> .c Extension("pyspike.cython.cython_profiles", ["pyspike/cython/cython_profiles.pyx"]), Extension("pyspike.cython.cython_distances", - ["pyspike/cython/cython_distances.pyx"]), - Extension("pyspike.directionality.cython.cython_directionality", - ["pyspike/directionality/cython/cython_directionality.pyx"]) + ["pyspike/cython/cython_distances.pyx"]) ] cmdclass.update({'build_ext': build_ext}) elif use_c: # c files are there, compile to binaries @@ -51,9 +48,7 @@ elif use_c: # c files are there, compile to binaries Extension("pyspike.cython.cython_profiles", ["pyspike/cython/cython_profiles.c"]), Extension("pyspike.cython.cython_distances", - ["pyspike/cython/cython_distances.c"]), - Extension("pyspike.directionality.cython.cython_directionality", - ["pyspike/directionality/cython/cython_directionality.c"]) + ["pyspike/cython/cython_distances.c"]) ] # neither cython nor c files available -> automatic fall-back to python backend -- cgit v1.2.3 From c17cc8602414cec883c412008a4300b2c7ac7f80 Mon Sep 17 00:00:00 2001 From: Mario Mulansky Date: Wed, 9 Mar 2016 14:13:11 +0100 Subject: new version: 0.5.1 --- doc/conf.py | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/doc/conf.py b/doc/conf.py index 7e13eae..807dec6 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -64,9 +64,9 @@ copyright = u'2014-2015, Mario Mulansky' # built documents. # # The short X.Y version. -version = '0.4' +version = '0.5' # The full version, including alpha/beta/rc tags. -release = '0.4.0' +release = '0.5.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 8ef431a..b53304b 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ to compile cython files: python setup.py build_ext --inplace -Copyright 2014-2015, Mario Mulansky +Copyright 2014-2016, 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.4.0', + version='0.5.1', cmdclass=cmdclass, ext_modules=ext_modules, include_dirs=[numpy.get_include()], -- cgit v1.2.3