Skip to content

Commit

Permalink
deduplicate requirements (NeuralEnsemble#159)
Browse files Browse the repository at this point in the history
* deduplicate requirements: `setup.py` reads now dependencies from the `requirements.txt` 
*  changed from one requirements file to categorical requirements
  • Loading branch information
healther authored and alperyeg committed May 16, 2018
1 parent 0ea945c commit 87396cd
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 21 deletions.
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Include requirements
include requirement*.txt
2 changes: 2 additions & 0 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numpydoc>=0.5
sphinx>=1.2.2
2 changes: 2 additions & 0 deletions requirements-extras.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pandas>=0.14.1
scikit-learn
1 change: 1 addition & 0 deletions requirements-tests.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nose>=1.3.3
11 changes: 1 addition & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
# essential
neo>=0.5.0
numpy>=1.8.2
quantities>=0.10.1
scipy>=0.14.0
six>=1.10.0
# optional
#pandas>=0.14.1
# for building documentation
#numpydoc>=0.5
#sklearn>=0.15.1
#sphinx>=1.2.2
# for running tests
nose>=1.3.3
six>=1.10.0
20 changes: 9 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@
from urllib import urlretrieve

long_description = open("README.rst").read()
install_requires = ['neo>=0.5.0',
'numpy>=1.8.2',
'quantities>=0.10.1',
'scipy>=0.14.0',
'six>=1.10.0']
extras_require = {'pandas': ['pandas>=0.14.1'],
'docs': ['numpydoc>=0.5',
'sphinx>=1.2.2'],
'tests': ['nose>=1.3.3']}
with open('requirements.txt', 'r') as fp:
install_requires = fp.read()
extras_require = {}
for extra in ['extras', 'docs', 'tests']:
with open('requirements-{0}.txt'.format(extra), 'r') as fp:
extras_require[extra] = fp.read()

# spade specific
is_64bit = sys.maxsize > 2 ** 32
Expand Down Expand Up @@ -51,13 +48,14 @@
os.path.join('spade_src', 'LICENSE'),
os.path.join('spade_src', '*.so')
]},

install_requires=install_requires,
extras_require=extras_require,

author="Elephant authors and contributors",
author_email="andrew.davison@unic.cnrs-gif.fr",
description="Elephant is a package for analysis of electrophysiology data in Python",
description="Elephant is a package for analysis of electrophysiology"
" data in Python",
long_description=long_description,
license="BSD",
url='http://neuralensemble.org/elephant',
Expand Down

0 comments on commit 87396cd

Please sign in to comment.