Skip to content

Commit 51fd9aa

Browse files
committed
fixes #48 use install_requires to install dependencies
1 parent 62d9f49 commit 51fd9aa

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

carousel/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
__author__ = u'Mark Mikofski'
88
__email__ = u'mark.mikofski@sunpowercorp.com'
99
__url__ = u'https://github.com/SunPower/Carousel'
10-
__version__ = u'0.2.3'
11-
__release__ = u'Balloons'
10+
__version__ = u'0.2.4'
11+
__release__ = u'Blue Balloons'

setup.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
except IOError:
2121
pass
2222

23+
REQUIRES = [
24+
'numpy', 'xlrd', 'scipy', 'python_dateutil', 'numexpr', 'pint (>=0.7.2)',
25+
'UncertaintyWrapper (>=0.4.1)', 'sphinx', 'nose', 'pandas', 'pytz', 'pvlib'
26+
]
27+
INST_REQ = ['%s%s' % (r[0], r[1][1:-1]) if len(r)==2 else r[0]
28+
for r in (r.split() for r in REQUIRES)]
29+
2330
setup(name='Carousel',
2431
version=__version__,
2532
description='Model Simulation Framework',
@@ -28,11 +35,8 @@
2835
author_email=__email__,
2936
url=__url__,
3037
packages=['carousel', 'carousel.core'],
31-
requires=[
32-
'numpy', 'xlrd', 'scipy', 'python_dateutil', 'numexpr',
33-
'pint (>=0.7.2)', 'UncertaintyWrapper (>=0.4.1)', 'sphinx', 'nose',
34-
'pandas', 'pytz', 'pvlib'
35-
],
38+
requires = REQUIRES,
39+
install_requires = INST_REQ,
3640
license='BSD 3-clause',
3741
scripts=['carousel-quickstart.py'],
3842
package_data={'carousel': [

0 commit comments

Comments
 (0)