diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
commit | ad29154d8c152996d16c012dcc5798c5f1957aed (patch) | |
tree | f01575082a649061362178d4a9870cb5fe2c33f6 /setup.py | |
parent | 1fa8493ce15af8cd4c057eece155f1557fc241ea (diff) | |
parent | c17cc8602414cec883c412008a4300b2c7ac7f80 (diff) |
Merge branch 'master' into new_directionality
Conflicts:
pyspike/__init__.py
pyspike/cython/cython_directionality.pyx
pyspike/cython/directionality_python_backend.py
pyspike/spike_directionality.py
setup.py
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -4,7 +4,7 @@ to compile cython files: python setup.py build_ext --inplace -Copyright 2014-2015, Mario Mulansky <mario.mulansky@gmx.net> +Copyright 2014-2016, Mario Mulansky <mario.mulansky@gmx.net> Distributed under the BSD License @@ -65,7 +65,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.5.1', cmdclass=cmdclass, ext_modules=ext_modules, include_dirs=[numpy.get_include()], @@ -94,12 +94,9 @@ train similarity', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', - ], - package_data={ - 'pyspike': ['cython/cython_add.c', 'cython/cython_profiles.c', - 'cython/cython_distances.c', - 'cython/cython_directionality.c', - 'cython/cython_simulated_annealing.c'], - 'test': ['Spike_testdata.txt'] - } + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + ] ) |