diff --git a/carousel/__init__.py b/carousel/__init__.py index 94af41a..2976423 100644 --- a/carousel/__init__.py +++ b/carousel/__init__.py @@ -7,5 +7,5 @@ __author__ = u'Mark Mikofski' __email__ = u'mark.mikofski@sunpowercorp.com' __url__ = u'https://github.com/SunPower/Carousel' -__version__ = u'0.2.3' -__release__ = u'Balloons' +__version__ = u'0.2.4' +__release__ = u'Blue Balloons' diff --git a/setup.py b/setup.py index f3bd1ee..57311d3 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,13 @@ except IOError: pass +REQUIRES = [ + 'numpy', 'xlrd', 'scipy', 'python_dateutil', 'numexpr', 'pint (>=0.7.2)', + 'UncertaintyWrapper (>=0.4.1)', 'sphinx', 'nose', 'pandas', 'pytz', 'pvlib' +] +INST_REQ = ['%s%s' % (r[0], r[1][1:-1]) if len(r)==2 else r[0] + for r in (r.split() for r in REQUIRES)] + setup(name='Carousel', version=__version__, description='Model Simulation Framework', @@ -28,11 +35,8 @@ author_email=__email__, url=__url__, packages=['carousel', 'carousel.core'], - requires=[ - 'numpy', 'xlrd', 'scipy', 'python_dateutil', 'numexpr', - 'pint (>=0.7.2)', 'UncertaintyWrapper (>=0.4.1)', 'sphinx', 'nose', - 'pandas', 'pytz', 'pvlib' - ], + requires = REQUIRES, + install_requires = INST_REQ, license='BSD 3-clause', scripts=['carousel-quickstart.py'], package_data={'carousel': [