diff --git a/.travis.yml b/.travis.yml index 0234809f..c70bc6a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,7 @@ addons: install: - install/nest.sh 2.14.0 - install/neuron.sh tag-1665alpha - - pip install git+https://github.com/tclose/nineml-python.git - - pip install git+https://github.com/tclose/nineml-catalog.git - - pip install git+https://github.com/tclose/Diophantine.git - - pip install -r requirements.txt + - pip install -e .[plot] - pip install coveralls script: - nosetests test/unittests --with-coverage --cover-package=pype9 diff --git a/pype9/__init__.py b/pype9/__init__.py index 3a9d1155..6b5b103a 100644 --- a/pype9/__init__.py +++ b/pype9/__init__.py @@ -7,6 +7,5 @@ # Import mpi4py here so it is always imported before Neuron, as otherwise # Neuron can throw an error +from .version import __version__ from .utils.mpi import mpi_comm - -__version__ = "0.1" diff --git a/pype9/version.py b/pype9/version.py new file mode 100644 index 00000000..b650ceb0 --- /dev/null +++ b/pype9/version.py @@ -0,0 +1 @@ +__version__ = '0.2' diff --git a/setup.cfg b/setup.cfg index fb10fec1..3c6e79cf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,2 @@ -# To build libninemlnrn shared library for random number generation in generated -# NMODL code -[build_ext] -# Although these are typically searched on most systems they may not be on -# macOS and useful as a placeholder example for non-standard locations -include_dirs=/usr/local/include -library_dirs=/usr/local/lib +[bdist_wheel] +universal=1 diff --git a/setup.py b/setup.py index db9db2d6..bc36a475 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from __future__ import print_function import os +import sys from setuptools import find_packages # @UnresolvedImport from distutils.core import setup @@ -18,10 +18,13 @@ # Filter unittests from packages packages = [p for p in find_packages() if not p.startswith('test.')] +sys.path.insert(0, package_dir) +from version import __version__ # @IgnorePep8 @UnresolvedImport +sys.path.pop(0) setup( - name="pype9", - version="0.2", + name=package_name, + version=__version__, package_data={package_name: package_data}, scripts=[os.path.join('scripts', 'pype9')], packages=packages, @@ -31,8 +34,7 @@ "neuron and neuron network 9ML (http://nineml.net) models " "and simulate them using well-established simulator backends," " NEURON and NEST."), - long_description=open(os.path.join(os.path.dirname(__file__), - "README.rst")).read(), + long_description=open("README.rst").read(), license="MIT", keywords=("NineML pipeline computational neuroscience modeling " "interoperability XML YAML JSON HDF5 9ML neuron nest"), @@ -40,7 +42,7 @@ classifiers=['Development Status :: 4 - Beta', 'Environment :: Console', 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: MIT', + 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2', @@ -49,4 +51,23 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', - 'Topic :: Scientific/Engineering']) + 'Topic :: Scientific/Engineering'], + install_requires=[ + 'sympy>=1.1', + 'Jinja2>=2.6', + 'docutils>=0.10', + 'mock>=1.0', + 'numpy>=1.5', + 'quantities>=0.11.1', + 'neo>=0.5.1', + 'mpi4py>=1.3.1', + 'pyNN>=0.9.1', + 'diophantine>=0.2.0', + 'PyYAML>=3.11', + 'h5py>=2.7.0', + 'future>=0.16'], + extra_requires={ + 'plot': 'matplotlib>=2.0'}, + test_requires=['nose'], + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4' +)